add provision to delete kueue resources created during test execution

Author: abhijeet-dhumal

tests/e2e/local_interactive_sdk_kind_test.py

@@ -19,13 +19,13 @@ def setup_method(self):
 
     def teardown_method(self):
         delete_namespace(self)
+        delete_kueue_resources(self)
 
     def test_local_interactives(self):
         self.setup_method()
         create_namespace(self)
         create_kueue_resources(self)
         self.run_local_interactives()
-        self.teardown_method()
 
     def run_local_interactives(self):
         ray_image = get_ray_image()

tests/e2e/local_interactive_sdk_oauth_test.py

@@ -19,13 +19,13 @@ def setup_method(self):
 
     def teardown_method(self):
         delete_namespace(self)
+        delete_kueue_resources(self)
 
     def test_local_interactives(self):
         self.setup_method()
         create_namespace(self)
         create_kueue_resources(self)
         self.run_local_interactives()
-        self.teardown_method()
 
     def run_local_interactives(self):
         ray_image = get_ray_image()

tests/e2e/mnist_raycluster_sdk_aw_kind_test.py

@@ -25,6 +25,7 @@ def test_mnist_ray_cluster_sdk_kind(self):
         create_namespace(self)
         create_kueue_resources(self)
         self.run_mnist_raycluster_sdk_kind()
+        self.teardown_method()
 
     def run_mnist_raycluster_sdk_kind(self):
         ray_image = get_ray_image()

tests/e2e/mnist_raycluster_sdk_kind_test.py

@@ -19,6 +19,7 @@ def setup_method(self):
 
     def teardown_method(self):
         delete_namespace(self)
+        delete_kueue_resources(self)
 
     def test_mnist_ray_cluster_sdk_kind(self):
         self.setup_method()

tests/e2e/mnist_raycluster_sdk_oauth_test.py

@@ -19,13 +19,13 @@ def setup_method(self):
 
     def teardown_method(self):
         delete_namespace(self)
+        delete_kueue_resources(self)
 
     def test_mnist_ray_cluster_sdk_auth(self):
         self.setup_method()
         create_namespace(self)
         create_kueue_resources(self)
         self.run_mnist_raycluster_sdk_oauth()
-        self.teardown_method()
 
     def run_mnist_raycluster_sdk_oauth(self):
         ray_image = get_ray_image()

tests/e2e/support.py

@@ -59,11 +59,17 @@ def run_oc_command(args):
         return None
 
 
+# Global variables for kueue resources
+cluster_queue = "cluster-queue-mnist"
+flavor = "default-flavor-mnist"
+local_queue = "local-queue-mnist"
+
+
 def create_kueue_resources(
     self,
-    cluster_queue="cluster-queue-mnist",
-    flavor="default-flavor-mnist",
-    local_queue="local-queue-mnist",
+    cluster_queue=cluster_queue,
+    flavor=flavor,
+    local_queue=local_queue,
 ):
     print("creating Kueue resources ...")
     resource_flavor_json = {
@@ -163,3 +169,29 @@ def create_kueue_resources(
             body=local_queue_json,
         )
         print(f"'{local_queue}' created in namespace '{self.namespace}'")
+
+
+def delete_kueue_resources(self, cluster_queue=cluster_queue, flavor=flavor):
+    # Delete if given cluster-queue exists
+    try:
+        self.custom_api.delete_cluster_custom_object(
+            group="kueue.x-k8s.io",
+            plural="clusterqueues",
+            version="v1beta1",
+            name=cluster_queue,
+        )
+        print(f"\n'{cluster_queue}' cluster-queue deleted")
+    except Exception as e:
+        print(f"\nError deleting cluster-queue '{cluster_queue}' : {e}")
+
+    # Delete if given resource-flavor exists
+    try:
+        self.custom_api.delete_cluster_custom_object(
+            group="kueue.x-k8s.io",
+            plural="resourceflavors",
+            version="v1beta1",
+            name=flavor,
+        )
+        print(f"'{flavor}' resource-flavor deleted")
+    except Exception as e:
+        print(f"\nError deleting resource-flavor '{flavor}' : {e}")

tests/upgrade/raycluster_sdk_upgrade_test.py

@@ -21,6 +21,7 @@ def setup_method(self):
             create_kueue_resources(self)
         except Exception as e:
             delete_namespace(self)
+            delete_kueue_resources(self)
             return _kube_api_error_handling(e)
 
     def test_mnist_ray_cluster_sdk_auth(self):