Cleanup code

Author: ChristianZaccaria

.github/workflows/e2e_tests.yaml

@@ -35,7 +35,6 @@ jobs:
           ls -lart
           echo "Initial status:"
           df -h
-
           echo "Cleaning up resources:"
           sudo swapoff -a
           sudo rm -f /swapfile
@@ -45,7 +44,6 @@ jobs:
           sudo rm -rf "/usr/local/share/boost"
           sudo rm -rf "$AGENT_TOOLSDIRECTORY"
           docker rmi $(docker image ls -aq)
-
           echo "Final status:"
           df -h
 

copyscript.sh

@@ -1,27 +1,5 @@
 #!/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

tests/e2e/install-codeflare-sdk.sh

@@ -62,12 +62,11 @@
     script="mnist.py",
     scheduler_args={"requirements": "requirements.txt"},
 )
-print("Submitting Job OSAOUBDAUDDAOUBDOUBUBAD")
 job = jobdef.submit(cluster)
 
 done = False
 time = 0
-timeout = 500
+timeout = 900
 while not done:
     status = job.status()
     if is_terminal(status.state):

tests/e2e/mnist_raycluster_sdk.py

@@ -208,14 +208,14 @@ func TestMNISTRayClusterSDK(t *testing.T) {
 	test.T().Logf("Created Job %s/%s successfully", job.Namespace, job.Name)
 
 	go func() {
-        scriptName := "../.././copyscript.sh"
+        scriptName := "./sdk-to-pod.sh"
         cmd := exec.Command(scriptName, namespace.Name)
 
 		var stdoutBuf, stderrBuf bytes.Buffer
 		cmd.Stdout = &stdoutBuf
 		cmd.Stderr = &stderrBuf
 
-        // Run the script
+        // Run the script to copy the SDK to the pod
         if err := cmd.Run(); err != nil {
 			t.Logf("STDOUT: %s", stdoutBuf.String())
         	t.Logf("STDERR: %s", stderrBuf.String())

tests/e2e/mnist_raycluster_sdk_test.go

@@ -0,0 +1,18 @@
+#!/bin/bash
+echo "Starting the script to copy the SDK to the pod"
+namespace=$1
+
+# Get the name of the pod starting with 'sdk' and its status
+while : ; do
+    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"
+        break
+    else
+        echo "Waiting for pod to be in Running state in namespace ${namespace}..."
+        sleep 5
+    fi
+done

tests/e2e/sdk-to-pod.sh

@@ -19,8 +19,6 @@ package e2e
 import (
 	"embed"
 
-	"io/ioutil"
-
 	"github.com/onsi/gomega"
 
 	"github.com/project-codeflare/codeflare-common/support"
@@ -35,10 +33,3 @@ func ReadFile(t support.Test, fileName string) []byte {
 	t.Expect(err).NotTo(gomega.HaveOccurred())
 	return file
 }
-
-func ReadWhlFile(t support.Test, fileName string) []byte {
-	t.T().Helper()
-	file, err := ioutil.ReadFile(fileName)
-	t.Expect(err).NotTo(gomega.HaveOccurred())
-	return file
-}