update

Author: abhijeet-dhumal

tests/odh/notebook.go

@@ -18,7 +18,6 @@ package odh
 
 import (
 	"bytes"
-	"os"
 
 	gomega "github.com/onsi/gomega"
 	. "github.com/project-codeflare/codeflare-common/support"
@@ -61,6 +60,7 @@ func createNotebook(test Test, namespace *corev1.Namespace, notebookUserToken, j
 	s3BucketName, _ := GetStorageBucketName()
 	s3AccessKeyId, _ := GetStorageBucketAccessKeyId()
 	s3SecretAccessKey, _ := GetStorageBucketSecretKey()
+	s3DefaultRegion, _ := GetStorageBucketDefaultRegion()
 
 	// Read the Notebook CR from resources and perform replacements for custom values using go template
 	notebookProps := NotebookProps{
@@ -78,45 +78,7 @@ func createNotebook(test Test, namespace *corev1.Namespace, notebookUserToken, j
 		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 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(),
+		S3DefaultRegion:           s3DefaultRegion,
 	}
 	notebookTemplate, err := files.ReadFile("resources/custom-nb-small.yaml")
 	test.Expect(err).NotTo(gomega.HaveOccurred())
@@ -147,7 +109,3 @@ func listNotebooks(test Test, namespace *corev1.Namespace) []*unstructured.Unstr
 
 	return ntbsp
 }
-
-func GetS3DefaultRegion() string {
-	return os.Getenv("AWS_DEFAULT_REGION")
-}

tests/odh/mnist_ray_finetune_test.go renamed to tests/odh/ray_finetune_llm_deepspeed_test.go

@@ -32,7 +32,7 @@ func mnistRayLlmFinetune(t *testing.T, numGpus int) {
 	test := With(t)
 
 	// Create a namespace
-	namespace := CreateTestNamespaceWithName(test, "ray-finetune-llm-deepspeed")
+	namespace := test.NewTestNamespace()
 
 	// Test configuration
 	jupyterNotebookConfigMapFileName := "ray_finetune_llm_deepspeed.ipynb"
@@ -64,11 +64,11 @@ func mnistRayLlmFinetune(t *testing.T, numGpus int) {
 	// Gracefully cleanup Notebook
 	defer func() {
 		deleteNotebook(test, namespace)
-		test.Eventually(listNotebooks(test, namespace), TestTimeoutMedium).Should(HaveLen(0))
+		test.Eventually(listNotebooks(test, namespace), TestTimeoutGpuProvisioning).Should(HaveLen(0))
 	}()
 
 	// Make sure the RayCluster is created and running
-	test.Eventually(RayClusters(test, namespace.Name), TestTimeoutLong).
+	test.Eventually(RayClusters(test, namespace.Name), TestTimeoutGpuProvisioning).
 		Should(
 			And(
 				HaveLen(1),
@@ -77,13 +77,26 @@ func mnistRayLlmFinetune(t *testing.T, numGpus int) {
 		)
 
 	// Make sure the RayCluster finishes and is deleted
-	test.Eventually(RayClusters(test, namespace.Name), TestTimeoutLong).
+	test.Eventually(RayClusters(test, namespace.Name), TestTimeoutGpuProvisioning).
 		Should(HaveLen(0))
 }
 
 func ReadRayFinetuneRequirementsTxt(test Test) []byte {
+	// Read the requirements.txt from resources and perform replacements for custom values using go template
+	props := struct {
+		PipIndexUrl    string
+		PipTrustedHost string
+	}{
+		PipIndexUrl: "--index " + string(GetPipIndexURL()),
+	}
+
+	// Provide trusted host only if defined
+	if len(GetPipTrustedHost()) > 0 {
+		props.PipTrustedHost = "--trusted-host " + GetPipTrustedHost()
+	}
+
 	template, err := files.ReadFile("resources/ray_finetune_demo/ray_finetune_requirements.txt")
 	test.Expect(err).NotTo(HaveOccurred())
 
-	return template
+	return ParseTemplate(test, template, props)
 }

tests/odh/resources/ray_finetune_demo/create_dataset.py

@@ -2,7 +2,7 @@
 import json
 import os
 
-dataset = load_dataset("gsm8k", "main", cache_dir="../../datasets")
+dataset = load_dataset("gsm8k", "main")
 
 dataset_splits = {"train": dataset["train"], "test": dataset["test"]}