update

Author: abhijeet-dhumal

tests/kfto/core/kfto_kueue_sft_test.go

@@ -79,7 +79,10 @@ func runPytorchjobWithSFTtrainer(t *testing.T, modelConfigFile string) {
 	}
 	clusterQueue := CreateKueueClusterQueue(test, cqSpec)
 	defer test.Client().Kueue().KueueV1beta1().ClusterQueues().Delete(test.Ctx(), clusterQueue.Name, metav1.DeleteOptions{})
-	localQueue := CreateKueueLocalQueue(test, namespace.Name, clusterQueue.Name)
+	annotations := map[string]string{
+		"kueue.x-k8s.io/default-queue": "true",
+	}
+	localQueue := CreateKueueLocalQueue(test, namespace.Name, clusterQueue.Name, annotations)
 
 	// Create training PyTorch job
 	tuningJob := createPyTorchJob(test, namespace.Name, localQueue.Name, *config)
@@ -143,7 +146,10 @@ func TestPytorchjobUsingKueueQuota(t *testing.T) {
 	}
 	clusterQueue := CreateKueueClusterQueue(test, cqSpec)
 	defer test.Client().Kueue().KueueV1beta1().ClusterQueues().Delete(test.Ctx(), clusterQueue.Name, metav1.DeleteOptions{})
-	localQueue := CreateKueueLocalQueue(test, namespace.Name, clusterQueue.Name)
+	annotations := map[string]string{
+		"kueue.x-k8s.io/default-queue": "true",
+	}
+	localQueue := CreateKueueLocalQueue(test, namespace.Name, clusterQueue.Name, annotations)
 
 	// Create first training PyTorch job
 	tuningJob := createPyTorchJob(test, namespace.Name, localQueue.Name, *config)

tests/kfto/upgrade/kfto_kueue_sft_upgrade_training_test.go

@@ -98,8 +98,10 @@ func TestSetupPytorchjob(t *testing.T) {
 	}
 	clusterQueue, err = test.Client().Kueue().KueueV1beta1().ClusterQueues().Create(test.Ctx(), clusterQueue, metav1.CreateOptions{})
 	test.Expect(err).NotTo(HaveOccurred())
-
-	localQueue := CreateKueueLocalQueue(test, namespaceName, clusterQueue.Name)
+	annotations := map[string]string{
+		"kueue.x-k8s.io/default-queue": "true",
+	}
+	localQueue := CreateKueueLocalQueue(test, namespaceName, clusterQueue.Name, annotations)
 
 	// Create training PyTorch job
 	tuningJob := createPyTorchJob(test, namespaceName, localQueue.Name, *config)

tests/odh/mnist_ray_finetune_test.go

@@ -32,7 +32,7 @@ func mnistRayLlmFinetune(t *testing.T, numGpus int) {
 	test := With(t)
 
 	// Create a namespace
-	namespace := test.NewTestNamespace()
+	namespace := CreateTestNamespaceWithName(test, "ray-finetune-llm-deepspeed")
 
 	// Test configuration
 	jupyterNotebookConfigMapFileName := "ray_finetune_llm_deepspeed.ipynb"

tests/odh/notebook.go

@@ -93,6 +93,44 @@ func createNotebook(test Test, namespace *corev1.Namespace, notebookUserToken, j
 	test.Expect(err).NotTo(gomega.HaveOccurred())
 }
 
+func createNotebookWithPvc(test Test, namespace *corev1.Namespace, notebookUserToken, jupyterNotebookConfigMapName, jupyterNotebookConfigMapFileName string, numGpus int) {
+	// Create PVC for Notebook
+	notebookPVC := CreatePersistentVolumeClaim(test, namespace.Name, "10Gi", corev1.ReadWriteOnce)
+	s3BucketName, _ := GetStorageBucketName()
+	s3AccessKeyId, _ := GetStorageBucketAccessKeyId()
+	s3SecretAccessKey, _ := GetStorageBucketSecretKey()
+
+	// Read the Notebook CR from resources and perform replacements for custom values using go template
+	notebookProps := NotebookProps{
+		IngressDomain:             GetOpenShiftIngressDomain(test),
+		OpenShiftApiUrl:           GetOpenShiftApiUrl(test),
+		KubernetesUserBearerToken: notebookUserToken,
+		Namespace:                 namespace.Name,
+		OpenDataHubNamespace:      GetOpenDataHubNamespace(test),
+		RayImage:                  GetRayImage(),
+		NotebookImage:             GetNotebookImage(test),
+		NotebookConfigMapName:     jupyterNotebookConfigMapName,
+		NotebookConfigMapFileName: jupyterNotebookConfigMapFileName,
+		NotebookPVC:               notebookPVC.Name,
+		NumGpus:                   numGpus,
+		S3BucketName:              s3BucketName,
+		S3AccessKeyId:             s3AccessKeyId,
+		S3SecretAccessKey:         s3SecretAccessKey,
+		S3DefaultRegion:           GetS3DefaultRegion(),
+	}
+	notebookTemplate, err := files.ReadFile("resources/custom-nb-small.yaml")
+	test.Expect(err).NotTo(gomega.HaveOccurred())
+
+	parsedNotebookTemplate := ParseTemplate(test, notebookTemplate, notebookProps)
+
+	// Create Notebook CR
+	notebookCR := &unstructured.Unstructured{}
+	err = yaml.NewYAMLOrJSONDecoder(bytes.NewBuffer(parsedNotebookTemplate), 8192).Decode(notebookCR)
+	test.Expect(err).NotTo(gomega.HaveOccurred())
+	_, err = test.Client().Dynamic().Resource(notebookResource).Namespace(namespace.Name).Create(test.Ctx(), notebookCR, metav1.CreateOptions{})
+	test.Expect(err).NotTo(gomega.HaveOccurred())
+}
+
 func deleteNotebook(test Test, namespace *corev1.Namespace) {
 	err := test.Client().Dynamic().Resource(notebookResource).Namespace(namespace.Name).Delete(test.Ctx(), "jupyter-nb-kube-3aadmin", metav1.DeleteOptions{})
 	test.Expect(err).NotTo(gomega.HaveOccurred())