testing: watsonx-serving: add crds and namespaces to delete for each of the depency operators

Author: kpouget

testing/watsonx-serving/config.yaml

@@ -268,18 +268,36 @@ rhods:
 
 prepare:
   operators:
-  - name: servicemeshoperator
-    catalog: redhat-operators
-    namespace: all
   - name: kiali-ossm
     catalog: redhat-operators
     namespace: all
+    cleanup:
+      crds:
+      - kialis.kiali.io
   - name: jaeger-product
     catalog: redhat-operators
     namespace: all
+    cleanup:
+      crds:
+        - jaegers.jaegertracing.io
   - name: serverless-operator
     catalog: redhat-operators
     namespace: all
+    cleanup:
+      crds:
+      - knativeservings.operator.knative.dev
+      namespaces:
+      - knative-eventing
+      - knative-serving
+  - name: servicemeshoperator
+    catalog: redhat-operators
+    namespace: all
+    cleanup:
+      crds:
+      - servicemeshmemberrolls.maistra.io
+      - servicemeshcontrolplanes.maistra.io
+      namespaces:
+      - istio-system
 
 base_image:
   namespace: watsonx-serving-user-test-driver

testing/watsonx-serving/prepare_watsonx_serving.py

@@ -64,15 +64,29 @@ def prepare():
 def undeploy_operator(operator):
     manifest_name = operator["name"]
     namespace = operator["namespace"]
+    if namespace == "all":
+        namespace = "openshift-operators"
 
-    installed_csv_cmd = run.run(f"oc get csv -oname -n {namespace}", capture_stdout=True)
-    if manifest_name not in installed_csv_cmd.stdout:
+    cleanup = operator.get("cleanup", dict(crds=[], namespaces=[]))
+
+    for crd in cleanup.get("crds", []):
+        run.run(f"oc delete {crd} --all -A")
+
+    installed_csv_cmd = run.run(f"oc get csv -oname -n {namespace} -loperators.coreos.com/{manifest_name}.{namespace}", capture_stdout=True)
+    if not installed_csv_cmd.stdout:
         logging.info(f"{manifest_name} operator is not installed")
-        return
 
-    run.run(f"oc delete sub/{manifest_name} -n {namespace}")
+    run.run(f"oc delete sub/{manifest_name} -n {namespace} --ignore-not-found")
     run.run(f"oc delete csv -n {namespace} -loperators.coreos.com/{manifest_name}.{namespace}")
 
+    for crd in cleanup.get("crds", []):
+        run.run(f"oc delete crd/{crd} --ignore-not-found")
+
+    for ns in cleanup.get("namespaces", []):
+        run.run(f"oc api-resources --verbs=list --namespaced -o name | xargs -t -n 1 oc get --show-kind --ignore-not-found -n watsonx-serving-user-test-driver > $ARTIFACT_DIR/{operator['name']}_{ns}.log", check=False)
+        run.run(f"oc delete ns {ns} --wait=False --ignore-not-found")
+
+
 
 def cleanup():
     rhods.uninstall()