[OSSM-8154] Hotfix for cleaning custom prometheus operator (#743)

maistra · Sep 18, 2024 · a456227 · a456227
1 parent 04a6483
commit a456227
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/pkg/tests/tasks/observability/custom_prometheus_test.go b/pkg/tests/tasks/observability/custom_prometheus_test.go
@@ -27,7 +27,6 @@ import (
 	"github.com/maistra/maistra-test-tool/pkg/util/env"
 	"github.com/maistra/maistra-test-tool/pkg/util/ns"
 	"github.com/maistra/maistra-test-tool/pkg/util/oc"
-	"github.com/maistra/maistra-test-tool/pkg/util/pod"
 	"github.com/maistra/maistra-test-tool/pkg/util/prometheus"
 	"github.com/maistra/maistra-test-tool/pkg/util/retry"
 	"github.com/maistra/maistra-test-tool/pkg/util/test"
@@ -50,12 +49,7 @@ func TestCustomPrometheus(t *testing.T) {
 		t.Cleanup(func() {
 			oc.RecreateNamespace(t, ns.Bookinfo)
 			oc.RecreateNamespace(t, meshNamespace)
-			oc.DeleteNamespace(t, customPrometheusNs)
-
-			// HACK: workaround for a bug with the OLM CSV cache (possibly OCPBUGS-5080)
-			// the bug is preventing re-installing prometheus again on the same cluster unless the cache is cleared
-			oc.DeletePod(t, pod.MatchingSelector("app=catalog-operator", "openshift-operator-lifecycle-manager"))
-			oc.DeletePod(t, pod.MatchingSelector("app=olm-operator", "openshift-operator-lifecycle-manager"))
+			prometheusoperator.Uninstall(t)
 		})
 
 		t.LogStep("Installing Prometheus operator")