Adjust support methods to use exceptions and remove explicit use of mcad parameter in cluster-configuration function (#494)

Author: abhijeet-dhumal

tests/e2e/support.py

@@ -4,7 +4,6 @@
 import subprocess
 from kubernetes import client, config
 import kubernetes.client
-import subprocess
 
 
 def get_ray_image():
@@ -27,10 +26,13 @@ def create_namespace(self):
 
 def create_namespace_with_name(self, namespace_name):
     self.namespace = namespace_name
-    namespace_body = client.V1Namespace(
-        metadata=client.V1ObjectMeta(name=self.namespace)
-    )
-    self.api_instance.create_namespace(namespace_body)
+    try:
+        namespace_body = client.V1Namespace(
+            metadata=client.V1ObjectMeta(name=self.namespace)
+        )
+        self.api_instance.create_namespace(namespace_body)
+    except Exception as e:
+        return _kube_api_error_handling(e)
 
 
 def delete_namespace(self):

tests/upgrade/raycluster_sdk_upgrade_test.py

@@ -19,7 +19,7 @@ class TestMNISTRayClusterUp:
     def setup_method(self):
         initialize_kubernetes_client(self)
         create_namespace_with_name(self, namespace)
-        cluster_queue = "cluster-queue"  # add cluster name here
+        cluster_queue = "cluster-queue"  # add cluster-queue name here
         create_local_queue(self, cluster_queue)
 
     def test_mnist_ray_cluster_sdk_auth(self):
@@ -50,25 +50,26 @@ def run_mnist_raycluster_sdk_oauth(self):
                 instascale=False,
                 image=ray_image,
                 write_to_file=True,
-                mcad=False,
             )
         )
 
         try:
             cluster.up()
             cluster.status()
             # wait for raycluster to be Ready
-            cluster.wait_ready()
+            # cluster.wait_ready() # temporarily broken
+            sleep(60)
             cluster.status()
             # Check cluster details
             cluster.details()
             # Assert the cluster status is READY
             _, ready = cluster.status()
-            assert ready, "Cluster is not ready!"
+            assert ready
 
         except Exception as e:
             print(f"An unexpected error occurred. Error: ", e)
             delete_namespace(self)
+            assert False, "Cluster is not ready!"
 
 
 class TestMnistJobSubmit: