Update

Author: jgwest

test/openshift/e2e/ginkgo/parallel/1-090_validate_permissions_test.go

@@ -19,6 +19,7 @@ package parallel
 import (
 	"context"
 	"fmt"
+	"strings"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -699,10 +700,23 @@ spec:
 
 			Expect(yaml.UnmarshalStrict([]byte(csvString), expectedCsv)).To(Succeed())
 
+			By("looking for a ClusterServiceVersion for openshift-gitops across all namespaces")
+			gitopsCSVsFound := []olmv1alpha1.ClusterServiceVersion{}
+			var csvList olmv1alpha1.ClusterServiceVersionList
+			Expect(k8sClient.List(ctx, &csvList)).To(Succeed())
+			for index := range csvList.Items {
+				csv := csvList.Items[index]
+				if strings.Contains(csv.Name, "openshift-gitops-operator") {
+					gitopsCSVsFound = append(gitopsCSVsFound, csv)
+				}
+			}
+			By("if more than one possible CSV is found, we will fail.")
+			Expect(gitopsCSVsFound).To(HaveLen(1), fmt.Sprintf("multiple CSVs were found: %v", gitopsCSVsFound))
+
 			actualCsv := &olmv1alpha1.ClusterServiceVersion{
 				ObjectMeta: metav1.ObjectMeta{
-					Name:      "openshift-gitops-operator.v1.16.0",
-					Namespace: "openshift-operators",
+					Name:      gitopsCSVsFound[0].Name,
+					Namespace: gitopsCSVsFound[0].Namespace,
 				},
 			}
 			Expect(k8sClient.Get(ctx, client.ObjectKeyFromObject(actualCsv), actualCsv)).To(Succeed())

test/openshift/e2e/ginkgo/sequential/1-034_validate_custom_roles_test.go

@@ -40,9 +40,15 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 
 			By("creating custom Argo CD Namespace test-1-034-custom")
 			test1NS := fixture.CreateNamespace("test-1-034-custom")
+			defer func() {
+				Expect(k8sClient.Delete(ctx, &test1NS)).To(Succeed())
+			}()
 
 			By("creating a test namespace with managed-by label, managed by test1 ns")
 			customRoleNS := fixture.CreateManagedNamespace("custom-role-namespace", test1NS.Name)
+			defer func() {
+				Expect(k8sClient.Delete(ctx, &customRoleNS)).To(Succeed())
+			}()
 
 			By("creating a sample cluster role for application-controller and server")
 			clusterRole := &rbacv1.ClusterRole{
@@ -58,12 +64,19 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 				},
 			}
 			Expect(k8sClient.Create(ctx, clusterRole)).To(Succeed())
+			defer func() {
+				Expect(k8sClient.Delete(ctx, clusterRole)).To(Succeed())
+				Eventually(clusterRole).Should(k8sFixture.NotExistByName())
+			}()
 
 			By("creating an Argo CD instance in the new namespace")
 			argoCDInTest1NS := &argov1beta1api.ArgoCD{
 				ObjectMeta: metav1.ObjectMeta{Name: "argocd", Namespace: test1NS.Name},
 			}
 			Expect(k8sClient.Create(ctx, argoCDInTest1NS)).To(Succeed())
+			defer func() {
+				Expect(k8sClient.Delete(ctx, argoCDInTest1NS)).To(Succeed()) // clean up on exit
+			}()
 
 			Eventually(argoCDInTest1NS, "3m", "5s").Should(argocdFixture.BeAvailable())
 
@@ -177,13 +190,6 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 				Namespace: test1NS.Name,
 			}}))
 
-			By("deleting namespaces created by the test")
-
-			Expect(k8sClient.Delete(ctx, argoCDInTest1NS)).To(Succeed())
-			Expect(k8sClient.Delete(ctx, &test1NS)).To(Succeed())
-			Expect(k8sClient.Delete(ctx, &customRoleNS)).To(Succeed())
-			Expect(k8sClient.Delete(ctx, &rbacv1.ClusterRole{ObjectMeta: metav1.ObjectMeta{Name: "custom-argocd-role"}})).To(Succeed())
-
 		})
 	})
 })