Reflect Poetry changes

Author: ChristianZaccaria

.github/workflows/e2e_tests.yaml

@@ -92,7 +92,7 @@ jobs:
         run: |
           export CODEFLARE_TEST_TIMEOUT_SHORT=1m
           export CODEFLARE_TEST_TIMEOUT_MEDIUM=5m
-          export CODEFLARE_TEST_TIMEOUT_LONG=10m
+          export CODEFLARE_TEST_TIMEOUT_LONG=15m
 
           export CODEFLARE_TEST_OUTPUT_DIR=${{ env.TEMP_DIR }}
           echo "CODEFLARE_TEST_OUTPUT_DIR=${CODEFLARE_TEST_OUTPUT_DIR}" >> $GITHUB_ENV

copyscript.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+
+# command to be ran on local host and not in the pod
+# kubectl apply -f temp-pod.yaml
+# kubectl cp ./ default/temp-pod4:/mnt
+
+
+
+echo "starting"
+namespace=$1
+# podname=$(kubectl get pods -n "${namespace}" -o custom-columns=:metadata.name | grep "^sdk")
+# kubectl cp ./ ${namespace}/${podname}:/codeflare-sdk
+
+# kubectl cp ./ ${namespace}/temp-pod:/mnt
+
+sleep 60
+
+# Get the name of the pod starting with 'sdk' and its status
+read podname podstatus <<< $(kubectl get pods -n "${namespace}" -o custom-columns=:metadata.name,:status.phase | grep "^sdk" | awk '{print $1, $2}')
+
+echo "$podname, $podstatus, $namespace"
+
+# Check if the pod is found and is in 'Running' status
+if [[ -n "$podname" && "$podstatus" == "Running" ]]; then
+    echo "Pod ${podname} is running. Proceeding to copy files."
+    kubectl cp ../.././ "${namespace}/${podname}:/codeflare-sdk"
+else
+    echo "Pod not found or not running."
+    exit 1
+fi

tests/e2e/install-codeflare-sdk.sh

@@ -1,23 +1,39 @@
 #!/bin/bash
 
+# Generate zip file beforehand
+# tar -czvf root-dir.tar.gz --exclude='.git' --exclude='.github' --exclude='.pytest_cache' ./
+
+# Create temp-pod to contain the zip file
+# kubectl apply -f temp-pod.yaml
+
+# Copy the zip file to the temp-pod:/mnt
+# kubectl cp root-dir.tar.gz temp-pod:/mnt
+
+# Run a shell in the temp-pod
+# kubectl exec -it temp-pod -- /bin/sh
+
+# Unzip the zip file
+# tar -xzvf /mnt/root-dir.tar.gz -C /mnt
+
+# Not necessary as the PVC is mounted to /codeflare-sdk
+# mv /mnt/* /codeflare-sdk/
+
+## Copy files from temp-pod /mnt into the codeflare-sdk volume mount in this other pod.
+# kubectl cp default/temp-pod:/mnt codeflare-sdk
+
+
+cd ..
+
 # Install Poetry and configure virtualenvs
 pip install poetry
 poetry config virtualenvs.create false
 
-# Clone the CodeFlare SDK repository
-echo "first ls"
-ls
-pip uninstall codeflare-sdk
-echo "install codeflare sdk"
-pip install codeflare_sdk-0.0.0.dev0-py3-none-any.whl
-echo "second ls"
-ls
-# git clone --branch main https://github.com/project-codeflare/codeflare-sdk.git
-# cd codeflare-sdk
-
-# # Lock dependencies and install them
-# poetry lock --no-update
-# poetry install --with test,docs
-
-# Return to the previous directory
-# cd ..
+cd codeflare-sdk
+
+# Lock dependencies and install them
+poetry lock --no-update
+poetry install --with test,docs
+
+# Return to the workdir
+cd ..
+cd workdir

tests/e2e/mnist_raycluster_sdk.py

@@ -67,7 +67,7 @@
 
 done = False
 time = 0
-timeout = 300
+timeout = 500
 while not done:
     status = job.status()
     if is_terminal(status.state):

tests/e2e/mnist_raycluster_sdk_test.go

@@ -17,6 +17,8 @@ limitations under the License.
 package e2e
 
 import (
+	"bytes"
+	"os/exec"
 	"testing"
 
 	. "github.com/onsi/gomega"
@@ -51,8 +53,6 @@ func TestMNISTRayClusterSDK(t *testing.T) {
 		"requirements.txt": ReadFile(test, "mnist_pip_requirements.txt"),
 		// MNIST training script
 		"mnist.py": ReadFile(test, "mnist.py"),
-		// SDK Wheel File
-		"codeflare_sdk-0.0.0.dev0-py3-none-any.whl": ReadWhlFile(test, "codeflare_sdk-0.0.0.dev0-py3-none-any.whl"),
 		// codeflare-sdk installation script
 		"install-codeflare-sdk.sh": ReadFile(test, "install-codeflare-sdk.sh"),
 	})
@@ -113,6 +113,30 @@ func TestMNISTRayClusterSDK(t *testing.T) {
 			BackoffLimit: Ptr(int32(0)),
 			Template: corev1.PodTemplateSpec{
 				Spec: corev1.PodSpec{
+					Volumes: []corev1.Volume{
+						{
+							Name: "test",
+							VolumeSource: corev1.VolumeSource{
+								ConfigMap: &corev1.ConfigMapVolumeSource{
+									LocalObjectReference: corev1.LocalObjectReference{
+										Name: config.Name,
+									},
+								},
+							},
+						},
+						{
+							Name: "codeflare-sdk",
+							VolumeSource: corev1.VolumeSource{
+								EmptyDir: &corev1.EmptyDirVolumeSource{},
+							},
+						},
+						{
+							Name: "workdir",
+							VolumeSource: corev1.VolumeSource{
+								EmptyDir: &corev1.EmptyDirVolumeSource{},
+							},
+						},
+					},
 					Containers: []corev1.Container{
 						{
 							Name: "test",
@@ -123,13 +147,20 @@ func TestMNISTRayClusterSDK(t *testing.T) {
 								{Name: "PYTHONUSERBASE", Value: "/workdir"},
 								{Name: "RAY_IMAGE", Value: GetRayImage()},
 							},
-							Command: []string{"/bin/sh", "-c", "cp /test/* . && chmod +x install-codeflare-sdk.sh && ./install-codeflare-sdk.sh && python mnist_raycluster_sdk.py" + " " + namespace.Name},
-							// Command: []string{"/bin/sh", "-c", "pip install /test/codeflare_sdk-0.0.0.dev0-py3-none-any.whl && cp /test/* . && python mnist_raycluster_sdk.py" + " " + namespace.Name},
+							Command: []string{
+								"/bin/sh", "-c",
+								"while [ ! -f /codeflare-sdk/pyproject.toml ]; do sleep 1; done; " +
+								"cp /test/* . && chmod +x install-codeflare-sdk.sh && ./install-codeflare-sdk.sh && python mnist_raycluster_sdk.py " + namespace.Name,
+							},
 							VolumeMounts: []corev1.VolumeMount{
 								{
 									Name:      "test",
 									MountPath: "/test",
 								},
+								{
+									Name:      "codeflare-sdk",
+									MountPath: "/codeflare-sdk",
+								},
 								{
 									Name:      "workdir",
 									MountPath: "/workdir",
@@ -148,24 +179,6 @@ func TestMNISTRayClusterSDK(t *testing.T) {
 							},
 						},
 					},
-					Volumes: []corev1.Volume{
-						{
-							Name: "test",
-							VolumeSource: corev1.VolumeSource{
-								ConfigMap: &corev1.ConfigMapVolumeSource{
-									LocalObjectReference: corev1.LocalObjectReference{
-										Name: config.Name,
-									},
-								},
-							},
-						},
-						{
-							Name: "workdir",
-							VolumeSource: corev1.VolumeSource{
-								EmptyDir: &corev1.EmptyDirVolumeSource{},
-							},
-						},
-					},
 					RestartPolicy:      corev1.RestartPolicyNever,
 					ServiceAccountName: sa.Name,
 				},
@@ -194,6 +207,22 @@ func TestMNISTRayClusterSDK(t *testing.T) {
 	test.Expect(err).NotTo(HaveOccurred())
 	test.T().Logf("Created Job %s/%s successfully", job.Namespace, job.Name)
 
+	go func() {
+        scriptName := "../.././copyscript.sh"
+        cmd := exec.Command(scriptName, namespace.Name)
+
+		var stdoutBuf, stderrBuf bytes.Buffer
+		cmd.Stdout = &stdoutBuf
+		cmd.Stderr = &stderrBuf
+
+        // Run the script
+        if err := cmd.Run(); err != nil {
+			t.Logf("STDOUT: %s", stdoutBuf.String())
+        	t.Logf("STDERR: %s", stderrBuf.String())
+            t.Logf("Failed to run the script: %v", err)
+        }
+    }()
+
 	test.T().Logf("Waiting for Job %s/%s to complete", job.Namespace, job.Name)
 	test.Eventually(Job(test, job.Namespace, job.Name), TestTimeoutLong).Should(
 		Or(