OCM-7801 | ci: Remove redundant cleaner to fix resource clean issue

openshift · May 9, 2024 · 6aaef6a · 6aaef6a
1 parent 0f7d409
commit 6aaef6a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/tests/e2e/test_rosacli_cluster.go b/tests/e2e/test_rosacli_cluster.go
@@ -172,10 +172,15 @@ var _ = Describe("Edit cluster",
 				clusterDetail, err := clusterService.ReflectClusterDescription(output)
 				Expect(err).ToNot(HaveOccurred())
 				expectedUWMValue := "Enabled"
+				recoverUWMStatus := false
 				if clusterConfig.DisableWorkloadMonitoring {
 					expectedUWMValue = "Disabled"
+					recoverUWMStatus = true
 				}
 				Expect(clusterDetail.UserWorkloadMonitoring).To(Equal(expectedUWMValue))
+				defer clusterService.EditCluster(clusterID,
+					fmt.Sprintf("--disable-workload-monitoring=%v", recoverUWMStatus),
+					"-y")
 
 				By("Disable the UWM")
 				expectedUWMValue = "Disabled"

diff --git a/tests/e2e/test_rosacli_idp.go b/tests/e2e/test_rosacli_idp.go
@@ -43,7 +43,6 @@ var _ = Describe("Edit IDP",
 			By("Clean remaining resources")
 			var errorList []error
 			errorList = append(errorList, rosaClient.CleanResources(clusterID))
-			errorList = append(errorList, rosaClient.CleanResources(clusterID))
 			Expect(errors.Join(errorList...)).ToNot(HaveOccurred())
 
 		})