add provision to delete kueue resources created during test

Author: sutaakar

demo-notebooks/guided-demos/1_cluster_job_client.ipynb

@@ -179,7 +179,7 @@
    "outputs": [],
    "source": [
     "# Delete a job\n",
-    "# Can run client.cancel_job(submission_id) first if job is still running\n",
+    "# Can run client.stop_job(submission_id) first if job is still running\n",
     "client.delete_job(submission_id)"
    ]
   },

tests/e2e/local_interactive_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_local_interactives(self):
         self.setup_method()

tests/e2e/local_interactive_sdk_oauth_test.py

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

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,6 +19,7 @@ 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()

tests/e2e/support.py

@@ -163,3 +163,31 @@ 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-mnist", flavor="default-flavor-mnist"
+):
+    # 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"Error deleting resource-flavor '{flavor}' : {e}")
+
+    # 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"'{cluster_queue}' cluster-queue deleted")
+    except Exception as e:
+        print(f"Error deleting cluster-queue '{cluster_queue}' : {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):
@@ -69,6 +70,7 @@ def run_mnist_raycluster_sdk_oauth(self):
         except Exception as e:
             print(f"An unexpected error occurred. Error: ", e)
             delete_namespace(self)
+            delete_kueue_resources(self)
             assert False, "Cluster is not ready!"