test changes

Signed-off-by: Varsha B <[email protected]>

Author: varshab1210

test/openshift/e2e/ginkgo/parallel/1-051-validate_csv_permissions_test.go

@@ -47,7 +47,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 			}
 
 			By("run oc command to verify our ability to delete resourcequotas")
-			res, err := osFixture.ExecCommand("oc", "auth", "can-i", "delete", "resourcequotas", "-n", "openshift-gitops", "--as", "system:serviceaccount:openshift-gitops-operator:openshift-gitops-operator-controller-manager")
+			res, err := osFixture.ExecCommand("oc", "auth", "can-i", "delete", "resourcequotas", "-n", "openshift-gitops", "--as", "system:serviceaccount:"+fixture.GetInstallationNamespace()+":openshift-gitops-operator-controller-manager")
 			Expect(err).ToNot(HaveOccurred())
 			Expect(strings.TrimSpace(res)).To(Equal("yes"))
 

test/openshift/e2e/ginkgo/parallel/1-077_validate_disable_dex_removed_test.go

@@ -66,7 +66,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 
 			} else {
 				subscription := &olmv1alpha1.Subscription{
-					ObjectMeta: metav1.ObjectMeta{Name: "openshift-gitops-operator", Namespace: "openshift-gitops-operator"},
+					ObjectMeta: metav1.ObjectMeta{Name: "openshift-gitops-operator", Namespace: fixture.GetInstallationNamespace()},
 				}
 				Expect(subscription).Should(k8sFixture.ExistByName())
 
@@ -80,7 +80,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 
 			csv := &olmv1alpha1.ClusterServiceVersion{ObjectMeta: metav1.ObjectMeta{
 				Name:      operatorNameVersion,
-				Namespace: "openshift-gitops-operator",
+				Namespace: fixture.GetInstallationNamespace(),
 			}}
 			Expect(k8sClient.Get(ctx, client.ObjectKeyFromObject(csv), csv)).To(Succeed())
 

test/openshift/e2e/ginkgo/sequential/1-018_validate_disable_default_instance_test.go

@@ -57,7 +57,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			operatorControllerDepl := &appsv1.Deployment{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      "openshift-gitops-operator-controller-manager",
-					Namespace: "openshift-gitops-operator", // The original kuttl test was 'openshift-operators'
+					Namespace: fixture.GetInstallationNamespace(), // The original kuttl test was 'openshift-operators'
 				},
 			}
 			Eventually(operatorControllerDepl).Should(k8sFixture.ExistByName())
@@ -90,7 +90,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			Eventually(openshiftGitopsArgoCD, "3m", "5s").Should(k8sFixture.ExistByName())
 			Eventually(openshiftGitopsArgoCD, "5m", "5s").Should(argocdFixture.BeAvailable())
 
-			By("verifying deployment and statefulset have expected number of replicas, including the repo server which should have 2")
+			By("verifying deployment and statefulset have expected number of replicas")
 			deploymentsToVerify := []string{
 				"openshift-gitops-server",
 				"openshift-gitops-redis",

test/openshift/e2e/ginkgo/sequential/1-035_validate_argocd_secret_repopulate_test.go

@@ -19,7 +19,7 @@ import (
 
 var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 
-	Context("1-035-validate_argocd_secret_repopulate", func() {
+	Context("1-035_validate_argocd_secret_repopulate", func() {
 
 		var (
 			ctx       context.Context
@@ -71,7 +71,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 				depl := &appsv1.Deployment{
 					ObjectMeta: metav1.ObjectMeta{
 						Name:      "openshift-gitops-operator-controller-manager",
-						Namespace: "openshift-gitops-operator",
+						Namespace: fixture.GetInstallationNamespace(),
 					},
 				}
 				Eventually(depl, "1m", "5s").Should(deploymentFixture.HaveReadyReplicas(1))

test/openshift/e2e/ginkgo/sequential/1-056_validate_managed-by_test.go

@@ -34,7 +34,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 		})
 
 		AfterEach(func() {
-			fixture.OutputDebugOnFail("test-1-56-target", "test-1-56-custom", "test-1-56-target-2", "test-1-56-custom-2", "openshift-gitops-operator")
+			fixture.OutputDebugOnFail("test-1-56-target", "test-1-56-custom", "test-1-56-target-2", "test-1-56-custom-2", fixture.GetInstallationNamespace())
 		})
 
 		It("verifies that managed-by works as expected and that REMOVE_MANAGED_BY_LABEL_ON_ARGOCD_DELETION will remove managed-by label when the related ArgoCD instance is deleted", func() {

test/openshift/e2e/ginkgo/sequential/1-085_validate_dynamic_plugin_installation_test.go

@@ -49,7 +49,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			// Find CSV
 			var csv *olmv1alpha1.ClusterServiceVersion
 			var csvList olmv1alpha1.ClusterServiceVersionList
-			Expect(k8sClient.List(ctx, &csvList, client.InNamespace("openshift-gitops-operator"))).To(Succeed())
+			Expect(k8sClient.List(ctx, &csvList, client.InNamespace(fixture.GetInstallationNamespace()))).To(Succeed())
 
 			for idx := range csvList.Items {
 				idxCSV := csvList.Items[idx]

test/openshift/e2e/ginkgo/sequential/1-104_validate_prometheus_alert_test.go

@@ -28,7 +28,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			sm := &monitoringv1.ServiceMonitor{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      "openshift-gitops-operator-metrics-monitor",
-					Namespace: "openshift-gitops-operator",
+					Namespace: fixture.GetInstallationNamespace(),
 				},
 			}
 			Eventually(sm).Should(k8sFixture.ExistByName())
@@ -43,7 +43,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 					SafeTLSConfig: monitoringv1.SafeTLSConfig{
 						CA:         monitoringv1.SecretOrConfigMap{},
 						Cert:       monitoringv1.SecretOrConfigMap{},
-						ServerName: "openshift-gitops-operator-metrics-service.openshift-gitops-operator.svc",
+						ServerName: "openshift-gitops-operator-metrics-service." + fixture.GetInstallationNamespace() + ".svc",
 					},
 					CAFile: "/etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt",
 				},