From 07be7a42de508e165fe4253fa5f5ca20e81676ef Mon Sep 17 00:00:00 2001
From: Anand Kumar Singh <anandrkskd@gmail.com>
Date: Mon, 13 Jul 2026 19:30:00 +0530
Subject: [PATCH 1/2] initial labeling tests for openshift

Signed-off-by: Anand Kumar Singh <anandrkskd@gmail.com>
---
 Makefile                                      |   8 +-
 test/e2e/argocd_route_test.go                 |   6 +-
 test/openshift/e2e/ginkgo/fixture/fixture.go  | 193 ++++++++++--------
 ...1-001_alpha_to_beta_dex_conversion_test.go |   2 +-
 ...ha_to_beta_sso_conflict_conversion_test.go |   2 +-
 .../1-003_validate_console_link_test.go       |   4 +-
 .../1-004_beta_to_alpha_conversion_test.go    |   2 +-
 .../parallel/1-005_validate_metrics_test.go   |   2 +-
 .../parallel/1-005_validate_route_tls_test.go |   2 +-
 .../1-023_validate_repo_server_tls_test.go    |   2 +-
 .../parallel/1-030_validate_reencrypt_test.go |   2 +-
 .../parallel/1-031_validate_toolchain_test.go |  43 ++--
 .../1-041_validate_argocd_sync_alert_test.go  |   2 +-
 .../1-042_validate_status_host_test.go        |   2 +-
 .../parallel/1-050_validate_sso_test.go       |   2 +-
 .../1-053_validate_cluster_admin_rbac_test.go |   2 +-
 .../1-054_validate_deploymentconfig_test.go   |   2 +-
 .../1-063_validate_dex_liveness_probe_test.go |   4 +-
 ...65_validate_redis_ha_anti_affinity_test.go |   2 +-
 ...redis_secure_comm_no_autotls_no_ha_test.go |   2 +-
 ...te_redis_secure_comm_no_autotls_ha_test.go |   4 +-
 ...idate_redis_secure_comm_autotls_ha_test.go |   2 +-
 ...validate_applicationset_deployment_test.go |   2 +-
 .../1-082_validate_node_placement_test.go     |   2 +-
 ...1-084_validate_status_host_ingress_test.go |   2 +-
 ...alidate_home_env_argocd_controller_test.go |   2 +-
 ...idate_reencrypt_termination_policy_test.go |   2 +-
 .../1-121_validate_custom_labels_rollouts.go  |   2 +-
 ...er_serving_cert_annotation_restore_test.go |   4 +-
 ...date_servicemonitor_metrics_config_test.go |   2 +-
 .../1-002-validate_backend_service_test.go    |   2 +-
 ...1-004_validate_argocd_installation_test.go |   2 +-
 .../1-006_validate_machine_config_test.go     |   2 +-
 .../1-008_validate-4.9CI-Failures_test.go     |   2 +-
 ...lidate-ootb-manage-other-namespace_test.go |   2 +-
 ..._validate_disable_default_instance_test.go |   2 +-
 .../1-020_validate_redis_ha_nonha_test.go     |   2 +-
 ...lidate_backend_service_permissions_test.go |   2 +-
 .../1-027_validate_operand_from_git_test.go   |   2 +-
 .../1-028-validate_run_on_infra_test.go       |   2 +-
 ..._validate_argocd_secret_repopulate_test.go |   2 +-
 ...e_rolebinding_for_source_namespace_test.go |   2 +-
 ...te_applicationset_in_any_namespace_test.go |   8 +-
 ...0_validate_quoted_RBAC_group_names_test.go |   2 +-
 ...51_validate_argocd_agent_principal_test.go |  20 +-
 .../1-052_validate_argocd_agent_agent_test.go |   6 +-
 .../1-052_validate_rolebinding_number_test.go |   2 +-
 ...e_argocd_agent_principal_connected_test.go |   2 +-
 ...te_notifications_source_namespaces_test.go |  10 +-
 ...te_argocd_agent_terminal_streaming_test.go |   2 +-
 .../1-064_validate_tcp_reset_error_test.go    |   2 +-
 .../sequential/1-071_validate_SCC_HA_test.go  |   2 +-
 .../1-071_validate_node_selectors_test.go     |   2 +-
 ...lidate_terminating_namespace_block_test.go |   2 +-
 ...083_validate_apps_in_any_namespace_test.go |   2 +-
 .../1-084_validate_prune_templates.go         |   2 +-
 ...1-086_validate_default_argocd_role_test.go |   2 +-
 ...lidate_workload_status_monitoring_alert.go |   2 +-
 ...lidate_rollouts_resources_creation_test.go |   2 +-
 ...1-101_validate_rollout_policyrules_test.go |   2 +-
 ...date_handle_terminating_namespaces_test.go |   2 +-
 ...1-103-validate-rollouts-imagepullpolicy.go |   4 +-
 ...-105_validate_default_argocd_route_test.go |   2 +-
 ...validate_argocd_metrics_controller_test.go |   2 +-
 .../1-107_validate_redis_scc_test.go          |   2 +-
 .../1-110_validate_podsecurity_alerts_test.go |   2 +-
 ...-111_validate_default_argocd_route_test.go |   2 +-
 ...12_validate_rollout_plugin_support_test.go |   2 +-
 .../1-114_validate_imagepullpolicy_test.go    |   6 +-
 .../1-120_repo_server_system_ca_trust.go      |  10 +-
 .../1-120_validate_running_must_gather.go     |   2 +-
 ...resource_constraints_gitopsservice_test.go |   6 +-
 .../1-122_validate_namespace_test.go          |   4 +-
 ...123_validate_list_order_comparison_test.go |   4 +-
 74 files changed, 250 insertions(+), 206 deletions(-)

diff --git a/Makefile b/Makefile
index 16343bc1ddb..879761d3bba 100644
--- a/Makefile
+++ b/Makefile
@@ -81,6 +81,12 @@ endif
 SHELL = /usr/bin/env bash -o pipefail
 .SHELLFLAGS = -ec
 
+# GINKGO_VERSION is the version of ginkgo to use.
+# Pick ginkgo version from go.mod file.
+# Update this command when ginkgo version is updated in go.mod file. 
+# example: go list -m -f '{{.Version}}' github.com/onsi/ginkgo/v3
+GINKGO_VERSION := $(shell go list -m -f '{{.Version}}' github.com/onsi/ginkgo/v2)
+
 .PHONY: all
 all: build
 
@@ -247,7 +253,7 @@ kustomize: ## Download kustomize locally if necessary.
 GINKGO_CLI = $(shell pwd)/bin/ginkgo
 .PHONY: ginkgo
 ginkgo: ## Download ginkgo locally if necessary.
-	$(call go-get-tool,$(GINKGO_CLI),github.com/onsi/ginkgo/v2/ginkgo@v2.29.0)
+	$(call go-get-tool,$(GINKGO_CLI),github.com/onsi/ginkgo/v2/ginkgo@$(GINKGO_VERSION))
 
 
 # go-get-tool will 'go install' any package $2 and install it to $1.
diff --git a/test/e2e/argocd_route_test.go b/test/e2e/argocd_route_test.go
index 20e39aceee9..8e8a0030539 100644
--- a/test/e2e/argocd_route_test.go
+++ b/test/e2e/argocd_route_test.go
@@ -33,15 +33,15 @@ var _ = Describe("Argo CD ConsoleLink controller", func() {
 		route := &routev1.Route{}
 		consoleLink := &console.ConsoleLink{}
 
-		It("Argocd route is present", func() {
+		It("Argocd route is present", Label("openshift"), func() {
 			checkIfPresent(types.NamespacedName{Name: argoCDRouteName, Namespace: argoCDNamespace}, route)
 		})
 
-		It("ConsoleLink is created", func() {
+		It("ConsoleLink is created", Label("openshift"), func() {
 			checkIfPresent(types.NamespacedName{Name: consoleLinkName}, consoleLink)
 		})
 
-		It("ConsoleLink and argocd route should match", func() {
+		It("ConsoleLink and argocd route should match", Label("openshift"), func() {
 			Eventually(func() error {
 				err := k8sClient.Get(context.TODO(), types.NamespacedName{Name: consoleLinkName}, consoleLink)
 				if err != nil {
diff --git a/test/openshift/e2e/ginkgo/fixture/fixture.go b/test/openshift/e2e/ginkgo/fixture/fixture.go
index a2c85a49513..6ed5334f208 100644
--- a/test/openshift/e2e/ginkgo/fixture/fixture.go
+++ b/test/openshift/e2e/ginkgo/fixture/fixture.go
@@ -60,14 +60,16 @@ func EnsureParallelCleanSlate() {
 
 	// Finally, wait for default openshift-gitops instance to be ready
 	// - Parallel tests should not write to any resources in 'openshift-gitops' namespace (sequential only), but they are allowed to read from them.
-	defaultOpenShiftGitOpsArgoCD := &argov1beta1api.ArgoCD{
-		ObjectMeta: metav1.ObjectMeta{Name: "openshift-gitops", Namespace: "openshift-gitops"},
-	}
-	err := k8sClient.Get(context.Background(), client.ObjectKeyFromObject(defaultOpenShiftGitOpsArgoCD), defaultOpenShiftGitOpsArgoCD)
-	Expect(err).ToNot(HaveOccurred())
-
-	Eventually(defaultOpenShiftGitOpsArgoCD, "5m", "5s").Should(argocd.BeAvailableWithCustomSleepTime(3 * time.Second))
+	// default instance only runs on openshift clusters
+	if RunningOnOpenShift() {
+		defaultOpenShiftGitOpsArgoCD := &argov1beta1api.ArgoCD{
+			ObjectMeta: metav1.ObjectMeta{Name: "openshift-gitops", Namespace: "openshift-gitops"},
+		}
+		err := k8sClient.Get(context.Background(), client.ObjectKeyFromObject(defaultOpenShiftGitOpsArgoCD), defaultOpenShiftGitOpsArgoCD)
+		Expect(err).ToNot(HaveOccurred())
 
+		Eventually(defaultOpenShiftGitOpsArgoCD, "5m", "5s").Should(argocd.BeAvailableWithCustomSleepTime(3 * time.Second))
+	}
 	// Unlike sequential clean slate, parallel clean slate cannot assume that there are no other tests running. This limits our ability to clean up old test artifacts.
 }
 
@@ -107,101 +109,104 @@ func EnsureSequentialCleanSlateWithError() error {
 		return err
 	}
 
+	// don't wait for openshift-gitops ArgoCD to exist, if it is on xKS cluster
 	// wait for openshift-gitops ArgoCD to exist, if it doesn't already
-	defaultOpenShiftGitOpsArgoCD := &argov1beta1api.ArgoCD{
-		ObjectMeta: metav1.ObjectMeta{Name: "openshift-gitops", Namespace: "openshift-gitops"},
-	}
-	Eventually(defaultOpenShiftGitOpsArgoCD, "3m", "5s").Should(k8s.ExistByName())
-
-	// Ensure that default state of ArgoCD CR in openshift-gitops is restored
-	if err := updateWithoutConflict(defaultOpenShiftGitOpsArgoCD, func(obj client.Object) {
-		argocdObj, ok := obj.(*argov1beta1api.ArgoCD)
-		Expect(ok).To(BeTrue())
-
-		// HA should be disabled by default
-		argocdObj.Spec.HA.Enabled = false
-
-		// .spec.monitoring.disableMetrics should be nil by default
-		argocdObj.Spec.Monitoring.DisableMetrics = nil
-
-		// Ensure that api server route has not been disabled, nor exposed via different settings
-		argocdObj.Spec.Server.Route = argov1beta1api.ArgoCDRouteSpec{
-			Enabled: true,
-			TLS:     nil,
-			// TLS: &routev1.TLSConfig{
-			// 	Termination:                   routev1.TLSTerminationReencrypt,
-			// 	InsecureEdgeTerminationPolicy: routev1.InsecureEdgeTerminationPolicyRedirect,
-			// },
+	if RunningOnOpenShift() {
+		defaultOpenShiftGitOpsArgoCD := &argov1beta1api.ArgoCD{
+			ObjectMeta: metav1.ObjectMeta{Name: "openshift-gitops", Namespace: "openshift-gitops"},
 		}
+		Eventually(defaultOpenShiftGitOpsArgoCD, "3m", "5s").Should(k8s.ExistByName())
+
+		// Ensure that default state of ArgoCD CR in openshift-gitops is restored
+		if err := updateWithoutConflict(defaultOpenShiftGitOpsArgoCD, func(obj client.Object) {
+			argocdObj, ok := obj.(*argov1beta1api.ArgoCD)
+			Expect(ok).To(BeTrue())
+
+			// HA should be disabled by default
+			argocdObj.Spec.HA.Enabled = false
+
+			// .spec.monitoring.disableMetrics should be nil by default
+			argocdObj.Spec.Monitoring.DisableMetrics = nil
+
+			// Ensure that api server route has not been disabled, nor exposed via different settings
+			argocdObj.Spec.Server.Route = argov1beta1api.ArgoCDRouteSpec{
+				Enabled: true,
+				TLS:     nil,
+				// TLS: &routev1.TLSConfig{
+				// 	Termination:                   routev1.TLSTerminationReencrypt,
+				// 	InsecureEdgeTerminationPolicy: routev1.InsecureEdgeTerminationPolicyRedirect,
+				// },
+			}
 
-		// Reset app controller processors to default
-		argocdObj.Spec.Controller.Processors = argov1beta1api.ArgoCDApplicationControllerProcessorsSpec{}
+			// Reset app controller processors to default
+			argocdObj.Spec.Controller.Processors = argov1beta1api.ArgoCDApplicationControllerProcessorsSpec{}
 
-		// Reset repo server replicas to default
-		argocdObj.Spec.Repo.Replicas = nil
+			// Reset repo server replicas to default
+			argocdObj.Spec.Repo.Replicas = nil
 
-		// Reset source namespaces
-		argocdObj.Spec.SourceNamespaces = nil
-		argocdObj.Spec.ApplicationSet.SourceNamespaces = nil
+			// Reset source namespaces
+			argocdObj.Spec.SourceNamespaces = nil
+			argocdObj.Spec.ApplicationSet.SourceNamespaces = nil
 
-	}); err != nil {
-		return err
-	}
+		}); err != nil {
+			return err
+		}
 
-	gitopsService := &gitopsoperatorv1alpha1.GitopsService{
-		ObjectMeta: metav1.ObjectMeta{Name: "cluster"},
-	}
-	if err := k8sClient.Get(ctx, client.ObjectKeyFromObject(gitopsService), gitopsService); err != nil {
-		return err
-	}
+		gitopsService := &gitopsoperatorv1alpha1.GitopsService{
+			ObjectMeta: metav1.ObjectMeta{Name: "cluster"},
+		}
+		if err := k8sClient.Get(ctx, client.ObjectKeyFromObject(gitopsService), gitopsService); err != nil {
+			return err
+		}
 
-	// Ensure that run on infra is disabled: some tests will enable it
-	if err := updateWithoutConflict(gitopsService, func(obj client.Object) {
-		goObj, ok := obj.(*gitopsoperatorv1alpha1.GitopsService)
-		Expect(ok).To(BeTrue())
+		// Ensure that run on infra is disabled: some tests will enable it
+		if err := updateWithoutConflict(gitopsService, func(obj client.Object) {
+			goObj, ok := obj.(*gitopsoperatorv1alpha1.GitopsService)
+			Expect(ok).To(BeTrue())
 
-		goObj.Spec.NodeSelector = nil
-		goObj.Spec.RunOnInfra = false
-		goObj.Spec.Tolerations = nil
-	}); err != nil {
-		return err
-	}
+			goObj.Spec.NodeSelector = nil
+			goObj.Spec.RunOnInfra = false
+			goObj.Spec.Tolerations = nil
+		}); err != nil {
+			return err
+		}
 
-	// Clean up old cluster-scoped role from 1-034
-	_ = k8sClient.Delete(ctx, &rbacv1.ClusterRole{ObjectMeta: metav1.ObjectMeta{Name: "custom-argocd-role"}})
+		// Clean up old cluster-scoped role from 1-034
+		_ = k8sClient.Delete(ctx, &rbacv1.ClusterRole{ObjectMeta: metav1.ObjectMeta{Name: "custom-argocd-role"}})
 
-	// Delete all existing RolloutManagers in openshift-gitops Namespace
-	var rolloutManagerList rolloutmanagerv1alpha1.RolloutManagerList
-	if err := k8sClient.List(ctx, &rolloutManagerList, client.InNamespace("openshift-gitops")); err != nil {
-		return err
-	}
-	for _, rm := range rolloutManagerList.Items {
-		if err := k8sClient.Delete(ctx, &rm); err != nil {
+		// Delete all existing RolloutManagers in openshift-gitops Namespace
+		var rolloutManagerList rolloutmanagerv1alpha1.RolloutManagerList
+		if err := k8sClient.List(ctx, &rolloutManagerList, client.InNamespace("openshift-gitops")); err != nil {
 			return err
 		}
-	}
+		for _, rm := range rolloutManagerList.Items {
+			if err := k8sClient.Delete(ctx, &rm); err != nil {
+				return err
+			}
+		}
 
-	// Delete 'restricted-dropcaps' which is created by at least one test
-	scc := &securityv1.SecurityContextConstraints{
-		ObjectMeta: metav1.ObjectMeta{
-			Name: "restricted-dropcaps",
-		},
-	}
-	if err := k8sClient.Delete(ctx, scc); err != nil {
-		if !apierr.IsNotFound(err) {
-			return err
+		// Delete 'restricted-dropcaps' which is created by at least one test
+		scc := &securityv1.SecurityContextConstraints{
+			ObjectMeta: metav1.ObjectMeta{
+				Name: "restricted-dropcaps",
+			},
+		}
+		if err := k8sClient.Delete(ctx, scc); err != nil {
+			if !apierr.IsNotFound(err) {
+				return err
+			}
+			// Otherwise, expected error if it doesn't exist.
 		}
-		// Otherwise, expected error if it doesn't exist.
-	}
 
-	// Finally, wait for default openshift-gitops instance to be ready.
-	failure := InterceptGomegaFailure(func() {
-		Eventually(defaultOpenShiftGitOpsArgoCD, "5m", "5s").Should(argocd.BeAvailable())
-	})
-	// Output debug information on argo startup failure
-	if failure != nil {
-		OutputDebug(defaultOpenShiftGitOpsArgoCD.Namespace)
-		Fail(failure.Error())
+		// Finally, wait for default openshift-gitops instance to be ready.
+		failure := InterceptGomegaFailure(func() {
+			Eventually(defaultOpenShiftGitOpsArgoCD, "5m", "5s").Should(argocd.BeAvailable())
+		})
+		// Output debug information on argo startup failure
+		if failure != nil {
+			OutputDebug(defaultOpenShiftGitOpsArgoCD.Namespace)
+			Fail(failure.Error())
+		}
 	}
 	return nil
 }
@@ -988,6 +993,22 @@ func RunningOnOpenShift() bool {
 	return openshiftAPIsFound > 5 // I picked 5 as an arbitrary number, could also just be 1
 }
 
+// IsOperatorRunningOnOLM returns true if the operator is running on OLM, false otherwise.
+func IsOperatorRunningOnOLM() bool {
+	k8sClient, _ := utils.GetE2ETestKubeClient()
+
+	crdList := crdv1.CustomResourceDefinitionList{}
+	Expect(k8sClient.List(context.Background(), &crdList)).To(Succeed())
+
+	olmAPIsFound := 0
+	for _, crd := range crdList.Items {
+		if strings.Contains(crd.Spec.Group, "operators.coreos.com") {
+			olmAPIsFound++
+		}
+	}
+	return olmAPIsFound > 0
+}
+
 //nolint:unused
 func outputPodLog(podSubstring string) {
 	k8sClient, _, err := utils.GetE2ETestKubeClientWithError()
diff --git a/test/openshift/e2e/ginkgo/parallel/1-001_alpha_to_beta_dex_conversion_test.go b/test/openshift/e2e/ginkgo/parallel/1-001_alpha_to_beta_dex_conversion_test.go
index f681706d9bf..832a636edb0 100644
--- a/test/openshift/e2e/ginkgo/parallel/1-001_alpha_to_beta_dex_conversion_test.go
+++ b/test/openshift/e2e/ginkgo/parallel/1-001_alpha_to_beta_dex_conversion_test.go
@@ -47,7 +47,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 			ctx = context.Background()
 		})
 
-		It("Ensure dex spec field can be converted between ArgoCD v1alpha1 and v1beta1", func() {
+		It("Ensure dex spec field can be converted between ArgoCD v1alpha1 and v1beta1", Label("openshift"), Label("conversionWebhook"), func() {
 
 			if fixture.EnvLocalRun() {
 				Skip("Conversion via webhook requires the operator to be running on the cluster, which is not the case for a local run")
diff --git a/test/openshift/e2e/ginkgo/parallel/1-003_alpha_to_beta_sso_conflict_conversion_test.go b/test/openshift/e2e/ginkgo/parallel/1-003_alpha_to_beta_sso_conflict_conversion_test.go
index f8cb6460d55..f608cecafec 100644
--- a/test/openshift/e2e/ginkgo/parallel/1-003_alpha_to_beta_sso_conflict_conversion_test.go
+++ b/test/openshift/e2e/ginkgo/parallel/1-003_alpha_to_beta_sso_conflict_conversion_test.go
@@ -48,7 +48,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 			ctx = context.Background()
 		})
 
-		It("verifies expected behaviour of ArgoCD CR when dex and keycloak are both specified in v1alpha1 API", func() {
+		It("verifies expected behaviour of ArgoCD CR when dex and keycloak are both specified in v1alpha1 API", Label("conversionWebhook"), func() {
 
 			if fixture.EnvLocalRun() {
 				Skip("Conversion via webhook requires the operator to be running on the cluster, which is not the case for a local run")
diff --git a/test/openshift/e2e/ginkgo/parallel/1-003_validate_console_link_test.go b/test/openshift/e2e/ginkgo/parallel/1-003_validate_console_link_test.go
index e9d370742ee..9f91a04d749 100644
--- a/test/openshift/e2e/ginkgo/parallel/1-003_validate_console_link_test.go
+++ b/test/openshift/e2e/ginkgo/parallel/1-003_validate_console_link_test.go
@@ -17,7 +17,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 			fixture.EnsureParallelCleanSlate()
 		})
 
-		It("verifies ConsoleLink exists and has expected content", func() {
+		It("verifies ConsoleLink exists and has expected content", Label("openshift"), func() {
 
 			consoleLink := &consolev1.ConsoleLink{ObjectMeta: metav1.ObjectMeta{
 				Name: "argocd",
@@ -25,8 +25,6 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 			Eventually(consoleLink).Should(k8sFixture.ExistByName())
 			Expect(string(consoleLink.Spec.Location)).To(Equal("ApplicationMenu"))
 			Expect(consoleLink.Spec.Text).To(Equal("Cluster Argo CD"))
-
 		})
-
 	})
 })
diff --git a/test/openshift/e2e/ginkgo/parallel/1-004_beta_to_alpha_conversion_test.go b/test/openshift/e2e/ginkgo/parallel/1-004_beta_to_alpha_conversion_test.go
index 0773b47f0c2..90be0465e46 100644
--- a/test/openshift/e2e/ginkgo/parallel/1-004_beta_to_alpha_conversion_test.go
+++ b/test/openshift/e2e/ginkgo/parallel/1-004_beta_to_alpha_conversion_test.go
@@ -48,7 +48,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 			ctx = context.Background()
 		})
 
-		It("verifies v1beta1 ArgoCD CR containing Dex SSO values can be converted to v1alpha1", func() {
+		It("verifies v1beta1 ArgoCD CR containing Dex SSO values can be converted to v1alpha1", Label("conversionWebhook"), func() {
 
 			if fixture.EnvLocalRun() {
 				Skip("Conversion via webhook requires the operator to be running on the cluster, which is not the case for a local run")
diff --git a/test/openshift/e2e/ginkgo/parallel/1-005_validate_metrics_test.go b/test/openshift/e2e/ginkgo/parallel/1-005_validate_metrics_test.go
index af90db34fe2..fb2eeaec7e8 100644
--- a/test/openshift/e2e/ginkgo/parallel/1-005_validate_metrics_test.go
+++ b/test/openshift/e2e/ginkgo/parallel/1-005_validate_metrics_test.go
@@ -19,7 +19,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 			fixture.EnsureParallelCleanSlate()
 		})
 
-		It("verifies that default ServiceMonitors exist in openshift-gitops and PrometheusRule ArgoCDSyncAlert exists", func() {
+		It("verifies that default ServiceMonitors exist in openshift-gitops and PrometheusRule ArgoCDSyncAlert exists", Label("openshift"), func() {
 
 			By("verifying openshift-gitops ServiceMonitor exists and has expected values")
 			openshiftGitOpsSM := &monitoringv1.ServiceMonitor{
diff --git a/test/openshift/e2e/ginkgo/parallel/1-005_validate_route_tls_test.go b/test/openshift/e2e/ginkgo/parallel/1-005_validate_route_tls_test.go
index 872e819fb80..7aab5a2bd81 100644
--- a/test/openshift/e2e/ginkgo/parallel/1-005_validate_route_tls_test.go
+++ b/test/openshift/e2e/ginkgo/parallel/1-005_validate_route_tls_test.go
@@ -50,7 +50,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 			ctx = context.Background()
 		})
 
-		It("ensures that certificates can be confirmed on server and webhook Routes", func() {
+		It("ensures that certificates can be confirmed on server and webhook Routes", Label("openshift"), func() {
 
 			fixture.EnsureRunningOnOpenShift()
 
diff --git a/test/openshift/e2e/ginkgo/parallel/1-023_validate_repo_server_tls_test.go b/test/openshift/e2e/ginkgo/parallel/1-023_validate_repo_server_tls_test.go
index ba70dfe3fe0..3b9e3bf9646 100644
--- a/test/openshift/e2e/ginkgo/parallel/1-023_validate_repo_server_tls_test.go
+++ b/test/openshift/e2e/ginkgo/parallel/1-023_validate_repo_server_tls_test.go
@@ -59,7 +59,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 			fixture.OutputDebugOnFail(nsTest_1_23_custom)
 		})
 
-		It("verifying ArgoCD .spec.repo AutoTLS and verifyTLS work as expected", func() {
+		It("verifying ArgoCD .spec.repo AutoTLS and verifyTLS work as expected", Label("openshift"), func() {
 
 			By("creating a namespace scoped Argo instance with AutoTLS set to 'openshift'")
 
diff --git a/test/openshift/e2e/ginkgo/parallel/1-030_validate_reencrypt_test.go b/test/openshift/e2e/ginkgo/parallel/1-030_validate_reencrypt_test.go
index a84667e0059..970fb0891fe 100644
--- a/test/openshift/e2e/ginkgo/parallel/1-030_validate_reencrypt_test.go
+++ b/test/openshift/e2e/ginkgo/parallel/1-030_validate_reencrypt_test.go
@@ -55,7 +55,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 			ctx = context.Background()
 		})
 
-		It("verifies Argo CD Server's Route can be enabled with TLSTerminationReencrypt", func() {
+		It("verifies Argo CD Server's Route can be enabled with TLSTerminationReencrypt", Label("openshift"), func() {
 
 			By("creating namespace-scoped Argo CD instance with rencrypt Route")
 
diff --git a/test/openshift/e2e/ginkgo/parallel/1-031_validate_toolchain_test.go b/test/openshift/e2e/ginkgo/parallel/1-031_validate_toolchain_test.go
index c1224337c1a..a1cdb496f52 100644
--- a/test/openshift/e2e/ginkgo/parallel/1-031_validate_toolchain_test.go
+++ b/test/openshift/e2e/ginkgo/parallel/1-031_validate_toolchain_test.go
@@ -25,6 +25,7 @@ import (
 	"strings"
 	"time"
 
+	argov1beta1api "github.com/argoproj-labs/argocd-operator/api/v1beta1"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	routev1 "github.com/openshift/api/route/v1"
@@ -53,14 +54,14 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 		})
 
 		// getPodName waits for there to exist a running pod with name 'name' in openshift-gitops
-		getPodName := func(name string) (string, error) {
+		getPodName := func(namespace, name string) (string, error) {
 
 			var podName string
 
 			if err := wait.PollUntilContextTimeout(context.Background(), time.Second*5, time.Minute*2, true, func(ctx context.Context) (done bool, err error) {
 
 				var podList corev1.PodList
-				if err := k8sClient.List(ctx, &podList, client.InNamespace("openshift-gitops")); err != nil {
+				if err := k8sClient.List(ctx, &podList, client.InNamespace(namespace)); err != nil {
 					GinkgoWriter.Println(err)
 					return false, nil
 				}
@@ -82,7 +83,25 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 			return podName, nil
 		}
 
-		It("verifies that toolchain versions have the expected values", func() {
+		FIt("verifies that toolchain versions have the expected values", func() {
+
+			// create a new namespace
+			ns, cleanupFunc := fixture.CreateNamespaceWithCleanupFunc("test-1-031-toolchain")
+			defer cleanupFunc()
+
+			//create a new argocd instance
+			argocdInstance := &argov1beta1api.ArgoCD{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "openshift-gitops",
+					Namespace: ns.Name,
+				},
+				Spec: argov1beta1api.ArgoCDSpec{
+					SSO: &argov1beta1api.ArgoCDSSOSpec{
+						Provider: "dex",
+					},
+				},
+			}
+			Expect(k8sClient.Create(context.Background(), argocdInstance)).To(Succeed())
 
 			// These variables need to be maintained according to the component matrix: https://spaces.redhat.com/display/GITOPS/GitOps+Component+Matrix
 			expected_kustomizeVersion := "v5.8.1"
@@ -105,25 +124,25 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 
 			By("locating pods containing toolchain in openshift-gitops")
 
-			gitops_server_pod, err := getPodName("openshift-gitops-server")
+			gitops_server_pod, err := getPodName(ns.Name, "openshift-gitops-server")
 			Expect(err).ToNot(HaveOccurred())
-			dex_pod, err := getPodName("openshift-gitops-dex-server")
+			dex_pod, err := getPodName(ns.Name, "openshift-gitops-dex-server")
 			Expect(err).ToNot(HaveOccurred())
-			redis_pod, err := getPodName("openshift-gitops-redis")
+			redis_pod, err := getPodName(ns.Name, "openshift-gitops-redis")
 			Expect(err).ToNot(HaveOccurred())
 
-			serverRoute := &routev1.Route{ObjectMeta: metav1.ObjectMeta{Name: "openshift-gitops-server", Namespace: "openshift-gitops"}}
+			serverRoute := &routev1.Route{ObjectMeta: metav1.ObjectMeta{Name: "openshift-gitops-server", Namespace: ns.Name}}
 			Eventually(serverRoute).Should(k8sFixture.ExistByName())
 
 			By("extracting the kustomize version from container")
 
-			kustomizeVersion, err := osFixture.ExecCommand("bash", "-c", "oc -n openshift-gitops exec "+gitops_server_pod+" -- kustomize version")
+			kustomizeVersion, err := osFixture.ExecCommand("bash", "-c", "oc -n"+ns.Name+" exec "+gitops_server_pod+" -- kustomize version")
 
 			Expect(err).NotTo(HaveOccurred())
 			kustomizeVersion = strings.TrimSpace(kustomizeVersion)
 
 			By("extracting the helm version from container")
-			helmVersion, err := osFixture.ExecCommand("bash", "-c", "oc -n openshift-gitops exec "+gitops_server_pod+" -- helm version")
+			helmVersion, err := osFixture.ExecCommand("bash", "-c", "oc -n"+ns.Name+" exec "+gitops_server_pod+" -- helm version")
 			Expect(err).NotTo(HaveOccurred())
 
 			// output format:
@@ -136,14 +155,14 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 			// After: v3.15.4
 
 			By("extracting the argo cd server version from container")
-			argocdVersion, err := osFixture.ExecCommand("bash", "-c", "oc -n openshift-gitops exec "+gitops_server_pod+" -- argocd version --short --server "+serverRoute.Spec.Host+" --insecure | grep 'argocd-server'")
+			argocdVersion, err := osFixture.ExecCommand("bash", "-c", "oc -n"+ns.Name+" exec "+gitops_server_pod+" -- argocd version --short --server "+serverRoute.Spec.Host+" --insecure | grep 'argocd-server'")
 			argocdVersion = strings.ReplaceAll(argocdVersion, "+unknown", "")
 			// output format:
 			// argocd-server: v2.13.1+af54ef8
 			Expect(err).NotTo(HaveOccurred())
 
 			By("extracting the dex version from container")
-			dexVersionOutput, err := osFixture.ExecCommand("bash", "-c", "oc -n openshift-gitops exec "+dex_pod+" -- dex version")
+			dexVersionOutput, err := osFixture.ExecCommand("bash", "-c", "oc -n"+ns.Name+" exec "+dex_pod+" -- dex version")
 			Expect(err).ToNot(HaveOccurred())
 			// Output format:
 			// Defaulted container "dex" out of: dex, copyutil (init)
@@ -164,7 +183,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 			Expect(dexVersion).ToNot(BeEmpty())
 
 			By("extracting the redis version from container")
-			redisVersion, err := osFixture.ExecCommand("bash", "-c", "oc -n openshift-gitops exec "+redis_pod+" -- redis-server -v")
+			redisVersion, err := osFixture.ExecCommand("bash", "-c", "oc -n"+ns.Name+" exec "+redis_pod+" -- redis-server -v")
 			// output format: Redis server v=6.2.7 sha=00000000:0 malloc=jemalloc-5.1.0 bits=64 build=5d88ce217879027a
 			redisVersion = redisVersion[strings.Index(redisVersion, "v=")+2:]
 			// After: v=6.2.7 (...)
diff --git a/test/openshift/e2e/ginkgo/parallel/1-041_validate_argocd_sync_alert_test.go b/test/openshift/e2e/ginkgo/parallel/1-041_validate_argocd_sync_alert_test.go
index ceefffbebfb..49993a9cbf9 100644
--- a/test/openshift/e2e/ginkgo/parallel/1-041_validate_argocd_sync_alert_test.go
+++ b/test/openshift/e2e/ginkgo/parallel/1-041_validate_argocd_sync_alert_test.go
@@ -20,7 +20,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 			fixture.EnsureParallelCleanSlate()
 		})
 
-		It("verifying PrometheusRule gitops-operator-argocd-alerts exists and has expected values", func() {
+		It("verifying PrometheusRule gitops-operator-argocd-alerts exists and has expected values", Label("openshift"), func() {
 
 			By("checking OpenShift GitOps ArgoCD instance is available")
 
diff --git a/test/openshift/e2e/ginkgo/parallel/1-042_validate_status_host_test.go b/test/openshift/e2e/ginkgo/parallel/1-042_validate_status_host_test.go
index ede968a22aa..90582399401 100644
--- a/test/openshift/e2e/ginkgo/parallel/1-042_validate_status_host_test.go
+++ b/test/openshift/e2e/ginkgo/parallel/1-042_validate_status_host_test.go
@@ -49,7 +49,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 			ctx = context.Background()
 		})
 
-		It("verifies that .status.host of ArgoCD matches .spec.host of Route, and status is updated when Route is removed", func() {
+		It("verifies that .status.host of ArgoCD matches .spec.host of Route, and status is updated when Route is removed", Label("openshift"), func() {
 
 			By("creating simple namespace-scoped Argo CD instance")
 			ns, cleanupFunc := fixture.CreateRandomE2ETestNamespaceWithCleanupFunc()
diff --git a/test/openshift/e2e/ginkgo/parallel/1-050_validate_sso_test.go b/test/openshift/e2e/ginkgo/parallel/1-050_validate_sso_test.go
index 98d5c633ca6..ee96624c6ff 100644
--- a/test/openshift/e2e/ginkgo/parallel/1-050_validate_sso_test.go
+++ b/test/openshift/e2e/ginkgo/parallel/1-050_validate_sso_test.go
@@ -67,7 +67,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 				cleanupFunc()
 			}
 		})
-		It("ensures the conditions in status when external Authentication is enabled on clusters; above 4.20 by default in openshit is enabled", func() {
+		It("ensures the conditions in status when external Authentication is enabled on clusters; above 4.20 by default in openshift is enabled", Label("openshift"), func() {
 			By("creating simple namespace-scoped Argo CD instance")
 			ocVersion := getOCPVersion()
 			Expect(ocVersion).ToNot(BeEmpty())
diff --git a/test/openshift/e2e/ginkgo/parallel/1-053_validate_cluster_admin_rbac_test.go b/test/openshift/e2e/ginkgo/parallel/1-053_validate_cluster_admin_rbac_test.go
index 5dc1aee567c..6948b0c45d0 100644
--- a/test/openshift/e2e/ginkgo/parallel/1-053_validate_cluster_admin_rbac_test.go
+++ b/test/openshift/e2e/ginkgo/parallel/1-053_validate_cluster_admin_rbac_test.go
@@ -35,7 +35,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 			fixture.EnsureParallelCleanSlate()
 		})
 
-		It("validates that openshift-gitops instance has expected .spec.RBAC.policy values", func() {
+		It("validates that openshift-gitops instance has expected .spec.RBAC.policy values", Label("openshift"), func() {
 
 			argoCD := &argov1beta1api.ArgoCD{
 				ObjectMeta: metav1.ObjectMeta{Name: "openshift-gitops", Namespace: "openshift-gitops"},
diff --git a/test/openshift/e2e/ginkgo/parallel/1-054_validate_deploymentconfig_test.go b/test/openshift/e2e/ginkgo/parallel/1-054_validate_deploymentconfig_test.go
index 74beaf882b7..3562911d3c0 100644
--- a/test/openshift/e2e/ginkgo/parallel/1-054_validate_deploymentconfig_test.go
+++ b/test/openshift/e2e/ginkgo/parallel/1-054_validate_deploymentconfig_test.go
@@ -49,7 +49,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 			ctx = context.Background()
 		})
 
-		It("verifies a DeploymentConfig can be deployed by Argo CD", func() {
+		It("verifies a DeploymentConfig can be deployed by Argo CD", Label("openshift"), func() {
 
 			By("creating simple namespace-scoped Argo CD instance")
 			ns, cleanupFunc := fixture.CreateRandomE2ETestNamespaceWithCleanupFunc()
diff --git a/test/openshift/e2e/ginkgo/parallel/1-063_validate_dex_liveness_probe_test.go b/test/openshift/e2e/ginkgo/parallel/1-063_validate_dex_liveness_probe_test.go
index ee3dc4ef6a3..f6c8e941014 100644
--- a/test/openshift/e2e/ginkgo/parallel/1-063_validate_dex_liveness_probe_test.go
+++ b/test/openshift/e2e/ginkgo/parallel/1-063_validate_dex_liveness_probe_test.go
@@ -30,8 +30,8 @@ import (
 )
 
 var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
-
-	Context("1-063_validate_dex_liveness_probe_test", func() {
+	// TODO: make it XKS compatible
+	Context("1-063_validate_dex_liveness_probe_test", Label("openshift"), Label("dex"), func() {
 
 		var (
 			k8sClient client.Client
diff --git a/test/openshift/e2e/ginkgo/parallel/1-065_validate_redis_ha_anti_affinity_test.go b/test/openshift/e2e/ginkgo/parallel/1-065_validate_redis_ha_anti_affinity_test.go
index afe912ca5a7..8e6da041ffa 100644
--- a/test/openshift/e2e/ginkgo/parallel/1-065_validate_redis_ha_anti_affinity_test.go
+++ b/test/openshift/e2e/ginkgo/parallel/1-065_validate_redis_ha_anti_affinity_test.go
@@ -49,7 +49,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 			ctx = context.Background()
 		})
 
-		It("ensuring that Redis HA StatefulSet has expected PodAffinity", func() {
+		It("ensuring that Redis HA StatefulSet has expected PodAffinity", Label("HA"), func() {
 
 			By("verifying we are running on a cluster with at least 3 nodes. This is required for Redis HA")
 			nodeFixture.ExpectHasAtLeastXNodes(3)
diff --git a/test/openshift/e2e/ginkgo/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha_test.go b/test/openshift/e2e/ginkgo/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha_test.go
index aa867da528f..a46ee865094 100644
--- a/test/openshift/e2e/ginkgo/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha_test.go
+++ b/test/openshift/e2e/ginkgo/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha_test.go
@@ -60,7 +60,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 			fixture.OutputDebugOnFail(ns)
 		})
 
-		It("validates that Argo CD components correctly inherit 'argocd-operator-redis-tls' Secret once it is created", func() {
+		FIt("validates that Argo CD components correctly inherit 'argocd-operator-redis-tls' Secret once it is created", func() {
 
 			By("creating simple namespace-scoped Argo CD instance")
 			ns, cleanupFunc = fixture.CreateRandomE2ETestNamespaceWithCleanupFunc()
diff --git a/test/openshift/e2e/ginkgo/parallel/1-067_validate_redis_secure_comm_no_autotls_ha_test.go b/test/openshift/e2e/ginkgo/parallel/1-067_validate_redis_secure_comm_no_autotls_ha_test.go
index cf840f168d9..a2180533e2d 100644
--- a/test/openshift/e2e/ginkgo/parallel/1-067_validate_redis_secure_comm_no_autotls_ha_test.go
+++ b/test/openshift/e2e/ginkgo/parallel/1-067_validate_redis_secure_comm_no_autotls_ha_test.go
@@ -61,7 +61,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 			fixture.OutputDebugOnFail(ns)
 		})
 
-		It("ensures that redis HA can be enabled with tls with generated certificate", func() {
+		It("ensures that redis HA can be enabled with tls with generated certificate", Label("HA"), func() {
 			By("verifying we are running on a cluster with at least 3 nodes. This is required for Redis HA")
 			nodeFixture.ExpectHasAtLeastXNodes(3)
 
@@ -218,7 +218,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 				"TLS .spec.template.spec.containers.command for argocd-application-controller statefulsets is wrong")
 		})
 
-		It("verify redis HA credential distribution", func() {
+		It("verify redis HA credential distribution", Label("HA"), func() {
 			By("verifying we are running on a cluster with at least 3 nodes. This is required for Redis HA")
 			nodeFixture.ExpectHasAtLeastXNodes(3)
 
diff --git a/test/openshift/e2e/ginkgo/parallel/1-069_validate_redis_secure_comm_autotls_ha_test.go b/test/openshift/e2e/ginkgo/parallel/1-069_validate_redis_secure_comm_autotls_ha_test.go
index b7fa85a1fdd..4d8b5141a42 100644
--- a/test/openshift/e2e/ginkgo/parallel/1-069_validate_redis_secure_comm_autotls_ha_test.go
+++ b/test/openshift/e2e/ginkgo/parallel/1-069_validate_redis_secure_comm_autotls_ha_test.go
@@ -58,7 +58,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 			fixture.OutputDebugOnFail(ns)
 		})
 
-		It("verifying when HA is enabled that Argo CD starts successfully in HA mode, and that AutoTLS can be enabled", func() {
+		It("verifying when HA is enabled that Argo CD starts successfully in HA mode, and that AutoTLS can be enabled", Label("HA"), func() {
 
 			By("verifying we are running on a cluster with at least 3 nodes. This is required for Redis HA")
 			nodeFixture.ExpectHasAtLeastXNodes(3)
diff --git a/test/openshift/e2e/ginkgo/parallel/1-081_validate_applicationset_deployment_test.go b/test/openshift/e2e/ginkgo/parallel/1-081_validate_applicationset_deployment_test.go
index 85af87a4c14..e195a04b041 100644
--- a/test/openshift/e2e/ginkgo/parallel/1-081_validate_applicationset_deployment_test.go
+++ b/test/openshift/e2e/ginkgo/parallel/1-081_validate_applicationset_deployment_test.go
@@ -37,7 +37,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 			fixture.EnsureParallelCleanSlate()
 		})
 
-		It("verifies that openshift-gitops Argo CD has applicationset controller workload and service with expected values", func() {
+		It("verifies that openshift-gitops Argo CD has applicationset controller workload and service with expected values", Label("openshift"), func() {
 
 			gitopsArgoCD, err := argocdFixture.GetOpenShiftGitOpsNSArgoCD()
 			Expect(err).ToNot(HaveOccurred())
diff --git a/test/openshift/e2e/ginkgo/parallel/1-082_validate_node_placement_test.go b/test/openshift/e2e/ginkgo/parallel/1-082_validate_node_placement_test.go
index 7d47fcacc0d..f5e477c7a15 100644
--- a/test/openshift/e2e/ginkgo/parallel/1-082_validate_node_placement_test.go
+++ b/test/openshift/e2e/ginkgo/parallel/1-082_validate_node_placement_test.go
@@ -49,7 +49,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 			ctx = context.Background()
 		})
 
-		It("verifies that setting values in .spec.nodePlacement on Argo CD CR cause those values to be set on the Argo CD Deployment/StatefulSet workloads", func() {
+		It("verifies that setting values in .spec.nodePlacement on Argo CD CR cause those values to be set on the Argo CD Deployment/StatefulSet workloads", Label("openshift"), func() {
 
 			By("creating a basic Argo CD instance")
 			ns, cleanupFunc := fixture.CreateRandomE2ETestNamespaceWithCleanupFunc()
diff --git a/test/openshift/e2e/ginkgo/parallel/1-084_validate_status_host_ingress_test.go b/test/openshift/e2e/ginkgo/parallel/1-084_validate_status_host_ingress_test.go
index e296d379942..14c7dd8ef69 100644
--- a/test/openshift/e2e/ginkgo/parallel/1-084_validate_status_host_ingress_test.go
+++ b/test/openshift/e2e/ginkgo/parallel/1-084_validate_status_host_ingress_test.go
@@ -47,7 +47,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 			ctx = context.Background()
 		})
 
-		It("ensures that when Argo CD Server is exposed via an Ingress, that the ingress is created and ArgoCD CR has the correct status information", func() {
+		It("ensures that when Argo CD Server is exposed via an Ingress, that the ingress is created and ArgoCD CR has the correct status information", Label("openshift"), func() {
 
 			// This test supersedes '1-002_verify_hostname_with_ingress'
 
diff --git a/test/openshift/e2e/ginkgo/parallel/1-096-validate_home_env_argocd_controller_test.go b/test/openshift/e2e/ginkgo/parallel/1-096-validate_home_env_argocd_controller_test.go
index b27411f9fd1..6bef9fc7436 100644
--- a/test/openshift/e2e/ginkgo/parallel/1-096-validate_home_env_argocd_controller_test.go
+++ b/test/openshift/e2e/ginkgo/parallel/1-096-validate_home_env_argocd_controller_test.go
@@ -35,7 +35,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 
 		})
 
-		It("verifies openshift-gitops app controller StatefulSet container has expected HOME env var and redis-initial-pass volume mount", func() {
+		It("verifies openshift-gitops app controller StatefulSet container has expected HOME env var and redis-initial-pass volume mount", Label("openshift"), func() {
 
 			By("verifying openshift-gitops-application-controller StatefulSet has the expected value for HOME")
 			ss := &appsv1.StatefulSet{
diff --git a/test/openshift/e2e/ginkgo/parallel/1-109_validate_reencrypt_termination_policy_test.go b/test/openshift/e2e/ginkgo/parallel/1-109_validate_reencrypt_termination_policy_test.go
index c836d64c673..fef0a87a823 100644
--- a/test/openshift/e2e/ginkgo/parallel/1-109_validate_reencrypt_termination_policy_test.go
+++ b/test/openshift/e2e/ginkgo/parallel/1-109_validate_reencrypt_termination_policy_test.go
@@ -19,7 +19,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 			fixture.EnsureParallelCleanSlate()
 		})
 
-		It("ensure the openshift-gitops default argo cd server route has expected TLS  Config values: insecure redirect and reencrypt, and the route ingress is sucessfully admitted", func() {
+		It("ensure the openshift-gitops default argo cd server route has expected TLS  Config values: insecure redirect and reencrypt, and the route ingress is sucessfully admitted", Label("openshift"), func() {
 
 			By("ensuring that default openshift-gitops has expecter route settings and an admitted ingress")
 			openshiftGitOpsArgoCD, err := argocdFixture.GetOpenShiftGitOpsNSArgoCD()
diff --git a/test/openshift/e2e/ginkgo/parallel/1-121_validate_custom_labels_rollouts.go b/test/openshift/e2e/ginkgo/parallel/1-121_validate_custom_labels_rollouts.go
index a149615d59f..8b723bb1ae0 100644
--- a/test/openshift/e2e/ginkgo/parallel/1-121_validate_custom_labels_rollouts.go
+++ b/test/openshift/e2e/ginkgo/parallel/1-121_validate_custom_labels_rollouts.go
@@ -46,7 +46,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 			ctx = context.Background()
 		})
 
-		It("ensures that custom labels set by the operator are added to Argo Rollouts resources", func() {
+		FIt("ensures that custom labels set by the operator are added to Argo Rollouts resources", func() {
 
 			By("creating namespace-scoped RolloutManager instance")
 			rolloutManager := &rolloutmanagerv1alpha1.RolloutManager{
diff --git a/test/openshift/e2e/ginkgo/parallel/1-125_validate_server_serving_cert_annotation_restore_test.go b/test/openshift/e2e/ginkgo/parallel/1-125_validate_server_serving_cert_annotation_restore_test.go
index 887bf111251..2a39d6a9112 100644
--- a/test/openshift/e2e/ginkgo/parallel/1-125_validate_server_serving_cert_annotation_restore_test.go
+++ b/test/openshift/e2e/ginkgo/parallel/1-125_validate_server_serving_cert_annotation_restore_test.go
@@ -49,7 +49,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 			ctx = context.Background()
 		})
 
-		It("restores service.beta.openshift.io/serving-cert-secret-name when Route TLS returns from passthrough to default reencrypt", func() {
+		It("restores service.beta.openshift.io/serving-cert-secret-name when Route TLS returns from passthrough to default reencrypt", Label("openshift"), func() {
 			ns, nsCleanup := fixture.CreateRandomE2ETestNamespaceWithCleanupFunc()
 			defer nsCleanup()
 
@@ -124,7 +124,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 
 		})
 
-		It("does not add serving-cert annotation when argocd-server-tls already exists as a user-managed secret (not Service CA)", func() {
+		It("does not add serving-cert annotation when argocd-server-tls already exists as a user-managed secret (not Service CA)", Label("openshift"), func() {
 			certPem, keyPem, err := certFixture.GenerateCert()
 			Expect(err).NotTo(HaveOccurred())
 
diff --git a/test/openshift/e2e/ginkgo/parallel/1-126_validate_servicemonitor_metrics_config_test.go b/test/openshift/e2e/ginkgo/parallel/1-126_validate_servicemonitor_metrics_config_test.go
index 6abffd98a13..199d0e11a2a 100644
--- a/test/openshift/e2e/ginkgo/parallel/1-126_validate_servicemonitor_metrics_config_test.go
+++ b/test/openshift/e2e/ginkgo/parallel/1-126_validate_servicemonitor_metrics_config_test.go
@@ -36,7 +36,7 @@ import (
 
 var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 
-	Context("1-126_validate_servicemonitor_metrics_config", func() {
+	Context("1-126_validate_servicemonitor_metrics_config", Label("openshift"), func() {
 
 		var (
 			k8sClient client.Client
diff --git a/test/openshift/e2e/ginkgo/sequential/1-002-validate_backend_service_test.go b/test/openshift/e2e/ginkgo/sequential/1-002-validate_backend_service_test.go
index a14faeb0642..0c56b986c6c 100644
--- a/test/openshift/e2e/ginkgo/sequential/1-002-validate_backend_service_test.go
+++ b/test/openshift/e2e/ginkgo/sequential/1-002-validate_backend_service_test.go
@@ -19,7 +19,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			fixture.EnsureSequentialCleanSlate()
 		})
 
-		It("validates backend service permissions", func() {
+		It("validates backend service permissions", Label("openshift"), func() {
 
 			By("checking the openshift-gitops namespace installed by default")
 			Eventually(&corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "openshift-gitops"}}).Should(k8sFixture.ExistByName())
diff --git a/test/openshift/e2e/ginkgo/sequential/1-004_validate_argocd_installation_test.go b/test/openshift/e2e/ginkgo/sequential/1-004_validate_argocd_installation_test.go
index d0bd5eba418..4338447632c 100644
--- a/test/openshift/e2e/ginkgo/sequential/1-004_validate_argocd_installation_test.go
+++ b/test/openshift/e2e/ginkgo/sequential/1-004_validate_argocd_installation_test.go
@@ -33,7 +33,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			fixture.EnsureSequentialCleanSlate()
 		})
 
-		It("verifies that default openshift-gitops Argo CD instance becomes available after modifying .spec.controller.processors.operation value", func() {
+		It("verifies that default openshift-gitops Argo CD instance becomes available after modifying .spec.controller.processors.operation value", Label("openshift"), func() {
 
 			By("verifying default openshift-gitops Argo CD instance is available")
 			argocd, err := argocdFixture.GetOpenShiftGitOpsNSArgoCD()
diff --git a/test/openshift/e2e/ginkgo/sequential/1-006_validate_machine_config_test.go b/test/openshift/e2e/ginkgo/sequential/1-006_validate_machine_config_test.go
index fdaa9f73efe..ef1c36ed652 100644
--- a/test/openshift/e2e/ginkgo/sequential/1-006_validate_machine_config_test.go
+++ b/test/openshift/e2e/ginkgo/sequential/1-006_validate_machine_config_test.go
@@ -71,7 +71,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			}
 		})
 
-		It("verifies that repo server replicas can be modified via .spec.repo.replicas", func() {
+		It("verifies that repo server replicas can be modified via .spec.repo.replicas", Label("openshift"), func() {
 
 			By("setting the repo server replicas to 2 on openshift-gitops Argo CD")
 			var err error
diff --git a/test/openshift/e2e/ginkgo/sequential/1-008_validate-4.9CI-Failures_test.go b/test/openshift/e2e/ginkgo/sequential/1-008_validate-4.9CI-Failures_test.go
index 59db3c045c4..d7bf1d11d12 100644
--- a/test/openshift/e2e/ginkgo/sequential/1-008_validate-4.9CI-Failures_test.go
+++ b/test/openshift/e2e/ginkgo/sequential/1-008_validate-4.9CI-Failures_test.go
@@ -50,7 +50,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			ctx = context.Background()
 		})
 
-		It("verifies 4.9 CI failures", func() {
+		It("verifies 4.9 CI failures", Label("openshift"), func() {
 
 			sourceNS := fixture.CreateNamespace("source-ns")
 
diff --git a/test/openshift/e2e/ginkgo/sequential/1-010_validate-ootb-manage-other-namespace_test.go b/test/openshift/e2e/ginkgo/sequential/1-010_validate-ootb-manage-other-namespace_test.go
index 5bd5ad742c1..af2cf006385 100644
--- a/test/openshift/e2e/ginkgo/sequential/1-010_validate-ootb-manage-other-namespace_test.go
+++ b/test/openshift/e2e/ginkgo/sequential/1-010_validate-ootb-manage-other-namespace_test.go
@@ -65,7 +65,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			}
 		})
 
-		It("verifies that openshift-gitops Argo CD instance is able to manage/unmanage other namespaces via managed-by label", func() {
+		It("verifies that openshift-gitops Argo CD instance is able to manage/unmanage other namespaces via managed-by label", Label("openshift"), func() {
 
 			By("creating a new namespace that is managed by openshift-gitops Argo CD instance")
 			nsTest_1_10_custom, nsCleanupFunc = fixture.CreateManagedNamespaceWithCleanupFunc("test-1-10-custom", "openshift-gitops")
diff --git a/test/openshift/e2e/ginkgo/sequential/1-018_validate_disable_default_instance_test.go b/test/openshift/e2e/ginkgo/sequential/1-018_validate_disable_default_instance_test.go
index ed5efb2759c..fd5adb6cbe9 100644
--- a/test/openshift/e2e/ginkgo/sequential/1-018_validate_disable_default_instance_test.go
+++ b/test/openshift/e2e/ginkgo/sequential/1-018_validate_disable_default_instance_test.go
@@ -40,7 +40,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			fixture.EnsureSequentialCleanSlate()
 		})
 
-		It("verifies that the default ArgoCD instance from openshift-gitops namespace is recreated when deleted manually", func() {
+		It("verifies that the default ArgoCD instance from openshift-gitops namespace is recreated when deleted manually", Label("openshift"), func() {
 
 			openshiftGitopsArgoCD, err := argocdFixture.GetOpenShiftGitOpsNSArgoCD()
 			Expect(err).ToNot(HaveOccurred())
diff --git a/test/openshift/e2e/ginkgo/sequential/1-020_validate_redis_ha_nonha_test.go b/test/openshift/e2e/ginkgo/sequential/1-020_validate_redis_ha_nonha_test.go
index 773261a8f74..38a5fb9fcad 100644
--- a/test/openshift/e2e/ginkgo/sequential/1-020_validate_redis_ha_nonha_test.go
+++ b/test/openshift/e2e/ginkgo/sequential/1-020_validate_redis_ha_nonha_test.go
@@ -41,7 +41,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			fixture.EnsureSequentialCleanSlate()
 		})
 
-		It("validates Redis HA and Non-HA", func() {
+		It("validates Redis HA and Non-HA", Label("openshift"), func() {
 
 			// This test enables HA, so it needs to be running on a cluster with at least 3 nodes
 			node.ExpectHasAtLeastXNodes(3)
diff --git a/test/openshift/e2e/ginkgo/sequential/1-026-validate_backend_service_permissions_test.go b/test/openshift/e2e/ginkgo/sequential/1-026-validate_backend_service_permissions_test.go
index 5e21496e761..e3197903d1d 100644
--- a/test/openshift/e2e/ginkgo/sequential/1-026-validate_backend_service_permissions_test.go
+++ b/test/openshift/e2e/ginkgo/sequential/1-026-validate_backend_service_permissions_test.go
@@ -19,7 +19,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			fixture.EnsureSequentialCleanSlate()
 		})
 
-		It("validates backend service permissions", func() {
+		It("validates backend service permissions", Label("openshift"), func() {
 
 			By("verifying that various backend-related resources exist and have the expected values")
 
diff --git a/test/openshift/e2e/ginkgo/sequential/1-027_validate_operand_from_git_test.go b/test/openshift/e2e/ginkgo/sequential/1-027_validate_operand_from_git_test.go
index f5e5f3a028b..0a131da10ec 100644
--- a/test/openshift/e2e/ginkgo/sequential/1-027_validate_operand_from_git_test.go
+++ b/test/openshift/e2e/ginkgo/sequential/1-027_validate_operand_from_git_test.go
@@ -68,7 +68,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			}
 		})
 
-		It("verifies that a custom Argo CD instance can be deployed by the 'openshift-gitops' Argo CD instance. It also verfies that the custom Argo CD instance is able to deploy a simple application", func() {
+		It("verifies that a custom Argo CD instance can be deployed by the 'openshift-gitops' Argo CD instance. It also verfies that the custom Argo CD instance is able to deploy a simple application", Label("openshift"), func() {
 
 			openshiftgitopsArgoCD, err := argocdFixture.GetOpenShiftGitOpsNSArgoCD()
 			Expect(err).ToNot(HaveOccurred())
diff --git a/test/openshift/e2e/ginkgo/sequential/1-028-validate_run_on_infra_test.go b/test/openshift/e2e/ginkgo/sequential/1-028-validate_run_on_infra_test.go
index 0190160ea67..b158a3e23b5 100644
--- a/test/openshift/e2e/ginkgo/sequential/1-028-validate_run_on_infra_test.go
+++ b/test/openshift/e2e/ginkgo/sequential/1-028-validate_run_on_infra_test.go
@@ -35,7 +35,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			ctx = context.Background()
 		})
 
-		It("validates that Argo CD runs on infra nodes", func() {
+		It("validates that Argo CD runs on infra nodes", Label("openshift"), func() {
 
 			By("enabling run on infra on GitOpsService CR")
 			gitopsService := &gitopsoperatorv1alpha1.GitopsService{
diff --git a/test/openshift/e2e/ginkgo/sequential/1-035_validate_argocd_secret_repopulate_test.go b/test/openshift/e2e/ginkgo/sequential/1-035_validate_argocd_secret_repopulate_test.go
index 1cb84673064..77dc9ecf98b 100644
--- a/test/openshift/e2e/ginkgo/sequential/1-035_validate_argocd_secret_repopulate_test.go
+++ b/test/openshift/e2e/ginkgo/sequential/1-035_validate_argocd_secret_repopulate_test.go
@@ -33,7 +33,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			ctx = context.Background()
 		})
 
-		It("verifies 'argocd-secret' secret is regenerated and we are able to login using that Secret", func() {
+		It("verifies 'argocd-secret' secret is regenerated and we are able to login using that Secret", Label("openshift"), func() {
 
 			By("checking OpenShift GitOps ArgoCD instance is available")
 			argocd, err := argocdFixture.GetOpenShiftGitOpsNSArgoCD()
diff --git a/test/openshift/e2e/ginkgo/sequential/1-036_validate_role_rolebinding_for_source_namespace_test.go b/test/openshift/e2e/ginkgo/sequential/1-036_validate_role_rolebinding_for_source_namespace_test.go
index b0e385c24c6..15d0b280c13 100644
--- a/test/openshift/e2e/ginkgo/sequential/1-036_validate_role_rolebinding_for_source_namespace_test.go
+++ b/test/openshift/e2e/ginkgo/sequential/1-036_validate_role_rolebinding_for_source_namespace_test.go
@@ -59,7 +59,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 
 		})
 
-		It("verifies that ArgoCD CR '.spec.sourceNamespaces' field wildcard-matching matches and manages only namespaces which match the wildcard", func() {
+		It("verifies that ArgoCD CR '.spec.sourceNamespaces' field wildcard-matching matches and manages only namespaces which match the wildcard", Label("openshift"), func() {
 
 			fixture.SetEnvInOperatorSubscriptionOrDeployment("ARGOCD_CLUSTER_CONFIG_NAMESPACES", "openshift-gitops, argocd-e2e-cluster-config")
 
diff --git a/test/openshift/e2e/ginkgo/sequential/1-037_validate_applicationset_in_any_namespace_test.go b/test/openshift/e2e/ginkgo/sequential/1-037_validate_applicationset_in_any_namespace_test.go
index ef2e8c65d4a..d39dbf8df05 100644
--- a/test/openshift/e2e/ginkgo/sequential/1-037_validate_applicationset_in_any_namespace_test.go
+++ b/test/openshift/e2e/ginkgo/sequential/1-037_validate_applicationset_in_any_namespace_test.go
@@ -66,7 +66,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 
 		})
 
-		It("verifying that ArgoCD CR '.spec.applicationset.sourcenamespaces' and '.spec.sourcenamespaces' correctly control role/rolebindings within the managed namespaces", func() {
+		It("verifying that ArgoCD CR '.spec.applicationset.sourcenamespaces' and '.spec.sourcenamespaces' correctly control role/rolebindings within the managed namespaces", Label("openshift"), func() {
 
 			By("0) create namespaces: appset-argocd, appset-old-ns, appset-new-ns")
 
@@ -846,7 +846,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			Eventually(roleInTargetNS, "2m", "5s").Should(k8sFixture.NotExistByName())
 		})
 
-		It("verifies that wildcard patterns in .spec.applicationSet.sourceNamespaces correctly match and manage multiple namespaces", func() {
+		It("verifies that wildcard patterns in .spec.applicationSet.sourceNamespaces correctly match and manage multiple namespaces", Label("openshift"), func() {
 
 			By("0) create namespaces: appset-argocd, team-1, team-2, team-frontend, team-backend, other-ns")
 
@@ -1081,7 +1081,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 
 		})
 
-		It("verifies ApplicationSet clusterrole rules and creates appset/app in another namespace", func() {
+		It("verifies ApplicationSet clusterrole rules and creates appset/app in another namespace", Label("openshift"), func() {
 
 			By("creating Argo CD namespace and target source namespace")
 			argoNamespace, cleanupFunc := fixture.CreateNamespaceWithCleanupFunc("appset-argocd-clusterrole")
@@ -1294,7 +1294,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			Eventually(appset).Should(k8sFixture.NotExistByName())
 		})
 
-		It("defaults tokenRef strict mode to true when applicationSet sourceNamespaces are configured", func() {
+		It("defaults tokenRef strict mode to true when applicationSet sourceNamespaces are configured", Label("openshift"), func() {
 			appsetArgocdNS, cleanupFunc := fixture.CreateNamespaceWithCleanupFunc("appset-argocd")
 			cleanupFunctions = append(cleanupFunctions, cleanupFunc)
 
diff --git a/test/openshift/e2e/ginkgo/sequential/1-040_validate_quoted_RBAC_group_names_test.go b/test/openshift/e2e/ginkgo/sequential/1-040_validate_quoted_RBAC_group_names_test.go
index 7dcb095fbdd..2cc85993972 100644
--- a/test/openshift/e2e/ginkgo/sequential/1-040_validate_quoted_RBAC_group_names_test.go
+++ b/test/openshift/e2e/ginkgo/sequential/1-040_validate_quoted_RBAC_group_names_test.go
@@ -30,7 +30,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 
 		})
 
-		It("creates a project role 'somerole' and group claim, and verifies group claim contains the expected data", func() {
+		It("creates a project role 'somerole' and group claim, and verifies group claim contains the expected data", Label("openshift"), func() {
 
 			defaultArgoCD, err := argocdFixture.GetOpenShiftGitOpsNSArgoCD()
 			Expect(err).ToNot(HaveOccurred())
diff --git a/test/openshift/e2e/ginkgo/sequential/1-051_validate_argocd_agent_principal_test.go b/test/openshift/e2e/ginkgo/sequential/1-051_validate_argocd_agent_principal_test.go
index 6af261cbe11..cf6f5dc4104 100644
--- a/test/openshift/e2e/ginkgo/sequential/1-051_validate_argocd_agent_principal_test.go
+++ b/test/openshift/e2e/ginkgo/sequential/1-051_validate_argocd_agent_principal_test.go
@@ -305,7 +305,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			agentFixture.VerifyResourcesDeleted(principalResources)
 		}
 
-		It("should create argocd agent principal resources, but pod should fail to start as image does not exist", func() {
+		It("should create argocd agent principal resources, but pod should fail to start as image does not exist", Label("openshift"), func() {
 			// Change log level to trace and custom image name
 			argoCD.Spec.ArgoCDAgent.Principal.LogLevel = "trace"
 			argoCD.Spec.ArgoCDAgent.Principal.Image = "quay.io/user/argocd-agent:v1"
@@ -346,7 +346,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			verifyResourcesDeleted()
 		})
 
-		It("should create argocd agent principal resources, and pod should start successfully with default image", func() {
+		It("should create argocd agent principal resources, and pod should start successfully with default image", Label("openshift"), func() {
 
 			// Add a custom environment variable to the principal server
 			argoCD.Spec.ArgoCDAgent.Principal.Env = []corev1.EnvVar{{Name: "TEST_ENV", Value: "test_value"}}
@@ -408,7 +408,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			verifyResourcesDeleted()
 		})
 
-		It("Should reflect configuration changes from ArgoCD CR to the principal deployment", func() {
+		It("Should reflect configuration changes from ArgoCD CR to the principal deployment", Label("openshift"), func() {
 
 			By("Create ArgoCD instance")
 
@@ -539,7 +539,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			}
 		})
 
-		It("should handle route enabled configuration correctly", func() {
+		It("should handle route enabled configuration correctly", Label("openshift"), func() {
 
 			By("Create ArgoCD instance with route enabled")
 
@@ -625,7 +625,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			}
 		})
 
-		It("should handle service type ClusterIP configuration correctly", func() {
+		It("should handle service type ClusterIP configuration correctly", Label("openshift"), func() {
 
 			By("Create ArgoCD instance with service type ClusterIP")
 
@@ -650,7 +650,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			Expect(principalService.Spec.Type).To(Equal(corev1.ServiceTypeClusterIP))
 		})
 
-		It("should handle service type LoadBalancer configuration correctly", func() {
+		It("should handle service type LoadBalancer configuration correctly", Label("openshift"), func() {
 
 			By("Create ArgoCD instance with service type LoadBalancer")
 
@@ -675,7 +675,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			Expect(principalService.Spec.Type).To(Equal(corev1.ServiceTypeLoadBalancer))
 		})
 
-		It("should handle service type updates correctly", func() {
+		It("should handle service type updates correctly", Label("openshift"), func() {
 
 			By("Create ArgoCD instance with service type ClusterIP")
 
@@ -717,7 +717,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			}, "30s", "2s").Should(Equal(corev1.ServiceTypeLoadBalancer))
 		})
 
-		It("should deploy principal via namespace-scoped ArgoCD instance and verify cluster role and cluster role binding are not created", func() {
+		It("should deploy principal via namespace-scoped ArgoCD instance and verify cluster role and cluster role binding are not created", Label("openshift"), func() {
 
 			By("Create namespace-scoped ArgoCD instance")
 
@@ -852,7 +852,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			}, "60s", "2s").Should(BeTrue(), "ArgoCD should be deleted")
 		})
 
-		It("should create principal NetworkPolicy if principal is enabled", func() {
+		It("should create principal NetworkPolicy if principal is enabled", Label("openshift"), func() {
 			By("Create ArgoCD instance with principal enabled")
 
 			argoCD.Spec.ArgoCDAgent.Principal.Enabled = ptr.To(true)
@@ -915,7 +915,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			Eventually(principalNetworkPolicy).Should(k8sFixture.NotExistByName())
 		})
 
-		It("should create and delete principal ServiceMonitor based on prometheus enabled flag", func() {
+		It("should create and delete principal ServiceMonitor based on prometheus enabled flag", Label("openshift"), func() {
 
 			By("Create ArgoCD instance with principal enabled and prometheus enabled")
 
diff --git a/test/openshift/e2e/ginkgo/sequential/1-052_validate_argocd_agent_agent_test.go b/test/openshift/e2e/ginkgo/sequential/1-052_validate_argocd_agent_agent_test.go
index 4f09dd428ee..aebdb45945c 100644
--- a/test/openshift/e2e/ginkgo/sequential/1-052_validate_argocd_agent_agent_test.go
+++ b/test/openshift/e2e/ginkgo/sequential/1-052_validate_argocd_agent_agent_test.go
@@ -281,7 +281,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			}
 		}
 
-		It("should create argocd agent agent resources, but pod should not be expected to run successfully without principal", func() {
+		It("should create argocd agent agent resources, but pod should not be expected to run successfully without principal", Label("openshift"), func() {
 			// Change log level to trace and custom image name
 			argoCD.Spec.ArgoCDAgent.Agent.LogLevel = "trace"
 			argoCD.Spec.ArgoCDAgent.Agent.Image = "quay.io/user/argocd-agent:v1"
@@ -368,7 +368,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			verifyResourcesDeleted()
 		})
 
-		It("Should reflect configuration changes from ArgoCD CR to the agent deployment", func() {
+		It("Should reflect configuration changes from ArgoCD CR to the agent deployment", Label("openshift"), func() {
 
 			By("Create ArgoCD instance")
 
@@ -586,7 +586,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			}, "60s", "2s").Should(BeTrue(), "ArgoCD should be deleted")
 		})
 
-		It("should create and delete agent ServiceMonitor based on prometheus enabled flag", func() {
+		It("should create and delete agent ServiceMonitor based on prometheus enabled flag", Label("openshift"), func() {
 
 			By("Create ArgoCD instance with agent enabled and prometheus enabled")
 
diff --git a/test/openshift/e2e/ginkgo/sequential/1-052_validate_rolebinding_number_test.go b/test/openshift/e2e/ginkgo/sequential/1-052_validate_rolebinding_number_test.go
index 75788f1cbff..0d4ef0624a8 100644
--- a/test/openshift/e2e/ginkgo/sequential/1-052_validate_rolebinding_number_test.go
+++ b/test/openshift/e2e/ginkgo/sequential/1-052_validate_rolebinding_number_test.go
@@ -35,7 +35,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			fixture.EnsureSequentialCleanSlate()
 		})
 
-		It("verifies RoleBindings are added to namespace-scoped Namespace when that Namespace is managed by openshift-gitops", func() {
+		It("verifies RoleBindings are added to namespace-scoped Namespace when that Namespace is managed by openshift-gitops", Label("openshift"), func() {
 
 			By("creating simple namespace-scoped Argo CD instance")
 			ns, cleanupFunc := fixture.CreateRandomE2ETestNamespaceWithCleanupFunc()
diff --git a/test/openshift/e2e/ginkgo/sequential/1-053_validate_argocd_agent_principal_connected_test.go b/test/openshift/e2e/ginkgo/sequential/1-053_validate_argocd_agent_principal_connected_test.go
index a6fb2527c93..03f300a69e1 100644
--- a/test/openshift/e2e/ginkgo/sequential/1-053_validate_argocd_agent_principal_connected_test.go
+++ b/test/openshift/e2e/ginkgo/sequential/1-053_validate_argocd_agent_principal_connected_test.go
@@ -531,7 +531,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 		// 4. Redis proxy can be accessed, and it contains data from child resources (e.g. pod), for both managed, and autonomous.
 		// 5. Resource proxy can be accessed, and it contains data from agent resources.
 		// This validates the core connectivity and basic workflow of agent-principal architecture, including RBAC, connection, and application propagation.
-		It("Should deploy ArgoCD principal and agent instances in both modes and verify they are working as expected", func() {
+		It("Should deploy ArgoCD principal and agent instances in both modes and verify they are working as expected", Label("openshift"), func() {
 
 			By("Deploy principal and verify it starts successfully")
 			deployPrincipal(ctx, k8sClient, registerCleanup, false)
diff --git a/test/openshift/e2e/ginkgo/sequential/1-058_validate_notifications_source_namespaces_test.go b/test/openshift/e2e/ginkgo/sequential/1-058_validate_notifications_source_namespaces_test.go
index b9dcfba29bb..e3ce3f91251 100644
--- a/test/openshift/e2e/ginkgo/sequential/1-058_validate_notifications_source_namespaces_test.go
+++ b/test/openshift/e2e/ginkgo/sequential/1-058_validate_notifications_source_namespaces_test.go
@@ -58,7 +58,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			fixture.OutputDebugOnFail("not-argocd-ns")
 		})
 
-		It("ensures that NotificationsConfiguration, Role, and RoleBinding are created in source namespaces when  notifications.sourceNamespaces is configured", func() {
+		It("ensures that NotificationsConfiguration, Role, and RoleBinding are created in source namespaces when  notifications.sourceNamespaces is configured", Label("openshift"), func() {
 
 			By("creating Argo CD instance namespace")
 			argocdNS, cleanupFunc := fixture.CreateNamespaceWithCleanupFunc("argocd-e2e-cluster-config")
@@ -198,7 +198,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 
 		})
 
-		It("ensures that resources are not created when namespace is not in SourceNamespaces", func() {
+		It("ensures that resources are not created when namespace is not in SourceNamespaces", Label("openshift"), func() {
 
 			By("creating Argo CD instance namespace")
 			argocdNS, cleanupFunc := fixture.CreateNamespaceWithCleanupFunc("argocd-e2e-cluster-config")
@@ -393,7 +393,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 
 		})
 
-		It("ensures that resources are not created when notifications are disabled", func() {
+		It("ensures that resources are not created when notifications are disabled", Label("openshift"), func() {
 
 			By("creating Argo CD instance namespace")
 			argocdNS, cleanupFunc := fixture.CreateNamespaceWithCleanupFunc("argocd-e2e-cluster-config")
@@ -462,7 +462,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 
 		})
 
-		It("ensures that notifications controller deployment command is updated when sourceNamespaces change", func() {
+		It("ensures that notifications controller deployment command is updated when sourceNamespaces change", Label("openshift"), func() {
 
 			By("creating Argo CD instance namespace")
 			argocdNS, cleanupFunc := fixture.CreateNamespaceWithCleanupFunc("argocd-e2e-cluster-config")
@@ -543,7 +543,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 
 		})
 
-		It("ensures that resources are created when notifications are enabled after being disabled", func() {
+		It("ensures that resources are created when notifications are enabled after being disabled", Label("openshift"), func() {
 
 			By("creating Argo CD instance namespace")
 			argocdNS, cleanupFunc := fixture.CreateNamespaceWithCleanupFunc("argocd-e2e-cluster-config")
diff --git a/test/openshift/e2e/ginkgo/sequential/1-059_validate_argocd_agent_terminal_streaming_test.go b/test/openshift/e2e/ginkgo/sequential/1-059_validate_argocd_agent_terminal_streaming_test.go
index cdc7c038ad3..a505f07e236 100644
--- a/test/openshift/e2e/ginkgo/sequential/1-059_validate_argocd_agent_terminal_streaming_test.go
+++ b/test/openshift/e2e/ginkgo/sequential/1-059_validate_argocd_agent_terminal_streaming_test.go
@@ -157,7 +157,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			registerCleanup(cleanupFuncManagedApplication)
 		})
 
-		It("Should open a terminal session to a pod deployed via ArgoCD agent and execute commands", func() {
+		It("Should open a terminal session to a pod deployed via ArgoCD agent and execute commands", Label("openshift"), func() {
 
 			By("Deploy principal with server route enabled and verify it starts successfully")
 			deployPrincipal(ctx, k8sClient, registerCleanup, true)
diff --git a/test/openshift/e2e/ginkgo/sequential/1-064_validate_tcp_reset_error_test.go b/test/openshift/e2e/ginkgo/sequential/1-064_validate_tcp_reset_error_test.go
index 77b984902ce..4fcabce5233 100644
--- a/test/openshift/e2e/ginkgo/sequential/1-064_validate_tcp_reset_error_test.go
+++ b/test/openshift/e2e/ginkgo/sequential/1-064_validate_tcp_reset_error_test.go
@@ -66,7 +66,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			}
 		})
 
-		It("verifies that argocd cli app manifests command will succesfully retrieve app manifests, and tcp reset error will not occur", func() {
+		It("verifies that argocd cli app manifests command will succesfully retrieve app manifests, and tcp reset error will not occur", Label("openshift"), func() {
 
 			// This test is VERY similar to 1-027.
 
diff --git a/test/openshift/e2e/ginkgo/sequential/1-071_validate_SCC_HA_test.go b/test/openshift/e2e/ginkgo/sequential/1-071_validate_SCC_HA_test.go
index 500b879c220..38c6431aabf 100644
--- a/test/openshift/e2e/ginkgo/sequential/1-071_validate_SCC_HA_test.go
+++ b/test/openshift/e2e/ginkgo/sequential/1-071_validate_SCC_HA_test.go
@@ -50,7 +50,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			ctx = context.Background()
 		})
 
-		It("creates SCC and ensure HA Argo CD starts as expected", func() {
+		It("creates SCC and ensure HA Argo CD starts as expected", Label("openshift"), func() {
 
 			By("verifying we are running on a cluster with at least 3 nodes. This is required for Redis HA")
 			nodeFixture.ExpectHasAtLeastXNodes(3)
diff --git a/test/openshift/e2e/ginkgo/sequential/1-071_validate_node_selectors_test.go b/test/openshift/e2e/ginkgo/sequential/1-071_validate_node_selectors_test.go
index beb189fefaa..97f660005fe 100644
--- a/test/openshift/e2e/ginkgo/sequential/1-071_validate_node_selectors_test.go
+++ b/test/openshift/e2e/ginkgo/sequential/1-071_validate_node_selectors_test.go
@@ -34,7 +34,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			ctx = context.Background()
 		})
 
-		It("verifies changes to GitOpsService's nodeselector, tolerations, and runOnInfra will modify Argo CD Deployments and StatefulSets", func() {
+		It("verifies changes to GitOpsService's nodeselector, tolerations, and runOnInfra will modify Argo CD Deployments and StatefulSets", Label("openshift"), func() {
 
 			By("ensuring Deployments and StatefulSets have nodeSelector of 'kubernetes.io/os: linux'")
 
diff --git a/test/openshift/e2e/ginkgo/sequential/1-074_validate_terminating_namespace_block_test.go b/test/openshift/e2e/ginkgo/sequential/1-074_validate_terminating_namespace_block_test.go
index 4158b29ccd0..4707634201c 100644
--- a/test/openshift/e2e/ginkgo/sequential/1-074_validate_terminating_namespace_block_test.go
+++ b/test/openshift/e2e/ginkgo/sequential/1-074_validate_terminating_namespace_block_test.go
@@ -49,7 +49,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			ctx = context.Background()
 		})
 
-		It("ensures that if one managed namespace is stuck in deleting state -- due to a finalizer -- it does not block other managed namespaces from being reconciled", func() {
+		It("ensures that if one managed namespace is stuck in deleting state -- due to a finalizer -- it does not block other managed namespaces from being reconciled", Label("openshift"), func() {
 
 			By("creating an Argo CD instance that will manage other namespaces")
 			gitops_2242_ns_main, cleanupFunc := fixture.CreateNamespaceWithCleanupFunc("gitops-2242-ns-main")
diff --git a/test/openshift/e2e/ginkgo/sequential/1-083_validate_apps_in_any_namespace_test.go b/test/openshift/e2e/ginkgo/sequential/1-083_validate_apps_in_any_namespace_test.go
index b17a4e53591..f68f09f854b 100644
--- a/test/openshift/e2e/ginkgo/sequential/1-083_validate_apps_in_any_namespace_test.go
+++ b/test/openshift/e2e/ginkgo/sequential/1-083_validate_apps_in_any_namespace_test.go
@@ -54,7 +54,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			ctx = context.Background()
 		})
 
-		It("verifies that namespaces added to .spec.sourceNamespaces are managed by openshift-gitops Argo CD instance, except when those namespaces also have managed-by label. Both addition and removal of values from this field are tested", func() {
+		It("verifies that namespaces added to .spec.sourceNamespaces are managed by openshift-gitops Argo CD instance, except when those namespaces also have managed-by label. Both addition and removal of values from this field are tested", Label("openshift"), func() {
 
 			By("1) create test-1-24-custom namespace managed by openshift-gitops instance")
 
diff --git a/test/openshift/e2e/ginkgo/sequential/1-084_validate_prune_templates.go b/test/openshift/e2e/ginkgo/sequential/1-084_validate_prune_templates.go
index 0a1576a6095..8bb1fe3ca64 100644
--- a/test/openshift/e2e/ginkgo/sequential/1-084_validate_prune_templates.go
+++ b/test/openshift/e2e/ginkgo/sequential/1-084_validate_prune_templates.go
@@ -63,7 +63,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			fixture.OutputDebugOnFail(ns)
 		})
 
-		It("validates that resources with duplicate GVKs can be pruned successfully with local sync", func() {
+		It("validates that resources with duplicate GVKs can be pruned successfully with local sync", Label("openshift"), func() {
 			By("creating a temp dir for git repo")
 			workDir, err := os.MkdirTemp("", "gitops-prune-test")
 			Expect(err).ToNot(HaveOccurred())
diff --git a/test/openshift/e2e/ginkgo/sequential/1-086_validate_default_argocd_role_test.go b/test/openshift/e2e/ginkgo/sequential/1-086_validate_default_argocd_role_test.go
index 3fdd4a2f330..67537979902 100644
--- a/test/openshift/e2e/ginkgo/sequential/1-086_validate_default_argocd_role_test.go
+++ b/test/openshift/e2e/ginkgo/sequential/1-086_validate_default_argocd_role_test.go
@@ -33,7 +33,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			ctx = context.Background()
 		})
 
-		It("verifies that Argo CD roles are defined as expected in argocd-rbac-cm, based on values in ArgoCD .spec.rbac.defaultPolicy", func() {
+		It("verifies that Argo CD roles are defined as expected in argocd-rbac-cm, based on values in ArgoCD .spec.rbac.defaultPolicy", Label("openshift"), func() {
 
 			By("verifying default ArgoCD in openshift-gitops is running and has defined expected RBAC values in ConfigMap argocd-rbac-cm")
 
diff --git a/test/openshift/e2e/ginkgo/sequential/1-092_validate_workload_status_monitoring_alert.go b/test/openshift/e2e/ginkgo/sequential/1-092_validate_workload_status_monitoring_alert.go
index d822b57d8be..b2485a75bc6 100644
--- a/test/openshift/e2e/ginkgo/sequential/1-092_validate_workload_status_monitoring_alert.go
+++ b/test/openshift/e2e/ginkgo/sequential/1-092_validate_workload_status_monitoring_alert.go
@@ -45,7 +45,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			fixture.OutputDebugOnFail(nsNamespaced)
 		})
 
-		It("validates monitoring setup, alert rule creation, and teardown", func() {
+		It("validates monitoring setup, alert rule creation, and teardown", Label("openshift"), func() {
 			const (
 				// picking image that exists to avoid ImagePullBackOff but should fail to run as an ApplicationSet controller
 				invalidImage        = "quay.io/libpod/alpine:latest"
diff --git a/test/openshift/e2e/ginkgo/sequential/1-100_validate_rollouts_resources_creation_test.go b/test/openshift/e2e/ginkgo/sequential/1-100_validate_rollouts_resources_creation_test.go
index ce0a655d878..68f0f4a42d6 100644
--- a/test/openshift/e2e/ginkgo/sequential/1-100_validate_rollouts_resources_creation_test.go
+++ b/test/openshift/e2e/ginkgo/sequential/1-100_validate_rollouts_resources_creation_test.go
@@ -33,7 +33,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			ctx = context.Background()
 		})
 
-		It("creates a cluster-scopes Argo Rollouts instance and verifies the expected K8s resources are created", func() {
+		It("creates a cluster-scopes Argo Rollouts instance and verifies the expected K8s resources are created", Label("openshift"), func() {
 
 			By("creating simple cluster-scoped Argo Rollouts instance via RolloutManager in openshift-gitops namespace")
 
diff --git a/test/openshift/e2e/ginkgo/sequential/1-101_validate_rollout_policyrules_test.go b/test/openshift/e2e/ginkgo/sequential/1-101_validate_rollout_policyrules_test.go
index 5416e3d9cd3..6218dccb8b4 100644
--- a/test/openshift/e2e/ginkgo/sequential/1-101_validate_rollout_policyrules_test.go
+++ b/test/openshift/e2e/ginkgo/sequential/1-101_validate_rollout_policyrules_test.go
@@ -30,7 +30,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			ctx = context.Background()
 		})
 
-		It("verifying Rollouts operator creates the expected policy rules", func() {
+		It("verifying Rollouts operator creates the expected policy rules", Label("openshift"), func() {
 
 			By("creating cluster-scoped Argo Rollouts instance in openshift-gitops RolloutManager")
 			rm := &rolloutmanagerv1alpha1.RolloutManager{
diff --git a/test/openshift/e2e/ginkgo/sequential/1-102_validate_handle_terminating_namespaces_test.go b/test/openshift/e2e/ginkgo/sequential/1-102_validate_handle_terminating_namespaces_test.go
index 3a6da663b2f..53a7785a8e3 100644
--- a/test/openshift/e2e/ginkgo/sequential/1-102_validate_handle_terminating_namespaces_test.go
+++ b/test/openshift/e2e/ginkgo/sequential/1-102_validate_handle_terminating_namespaces_test.go
@@ -81,7 +81,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			}
 		})
 
-		It("ensures that if one managed-by namespace is stuck in terminating, it does not prevent other managed-by namespaces from being managed or deployed to", func() {
+		It("ensures that if one managed-by namespace is stuck in terminating, it does not prevent other managed-by namespaces from being managed or deployed to", Label("openshift"), func() {
 
 			By("creating simple namespace-scoped Argo CD instance")
 			ns, nsCleanupFunc = fixture.CreateRandomE2ETestNamespaceWithCleanupFunc()
diff --git a/test/openshift/e2e/ginkgo/sequential/1-103-validate-rollouts-imagepullpolicy.go b/test/openshift/e2e/ginkgo/sequential/1-103-validate-rollouts-imagepullpolicy.go
index 1076ca0bb7c..f7a3215c6a1 100644
--- a/test/openshift/e2e/ginkgo/sequential/1-103-validate-rollouts-imagepullpolicy.go
+++ b/test/openshift/e2e/ginkgo/sequential/1-103-validate-rollouts-imagepullpolicy.go
@@ -48,7 +48,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			ctx = context.Background()
 		})
 
-		It("creates a cluster-scopes Argo Rollouts instance and verifies the default image pull policy", func() {
+		It("creates a cluster-scopes Argo Rollouts instance and verifies the default image pull policy", Label("openshift"), func() {
 
 			By("creating simple cluster-scoped Argo Rollouts instance via RolloutManager in openshift-gitops namespace")
 
@@ -72,7 +72,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 
 		})
 
-		It("creates a cluster-scopes Argo Rollouts instance and verifies the CR value imagePullPolicy is applied", func() {
+		It("creates a cluster-scopes Argo Rollouts instance and verifies the CR value imagePullPolicy is applied", Label("openshift"), func() {
 
 			By("creating simple cluster-scoped Argo Rollouts instance via RolloutManager in openshift-gitops namespace with imagePullPolicy set to Always")
 
diff --git a/test/openshift/e2e/ginkgo/sequential/1-105_validate_default_argocd_route_test.go b/test/openshift/e2e/ginkgo/sequential/1-105_validate_default_argocd_route_test.go
index c383cfcdcec..d9c5cc1d880 100644
--- a/test/openshift/e2e/ginkgo/sequential/1-105_validate_default_argocd_route_test.go
+++ b/test/openshift/e2e/ginkgo/sequential/1-105_validate_default_argocd_route_test.go
@@ -39,7 +39,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			fixture.EnsureSequentialCleanSlate()
 		})
 
-		It("ensure that openshift-gitops Argo CD has correct default settings, and those settings can be changed which will affect the server Route", func() {
+		It("ensure that openshift-gitops Argo CD has correct default settings, and those settings can be changed which will affect the server Route", Label("openshift"), func() {
 
 			By("verifying Argo CD in openshift-gitops exists and has server route enabled")
 
diff --git a/test/openshift/e2e/ginkgo/sequential/1-106_validate_argocd_metrics_controller_test.go b/test/openshift/e2e/ginkgo/sequential/1-106_validate_argocd_metrics_controller_test.go
index 08a7da2bcd9..bbb24ed6fe7 100644
--- a/test/openshift/e2e/ginkgo/sequential/1-106_validate_argocd_metrics_controller_test.go
+++ b/test/openshift/e2e/ginkgo/sequential/1-106_validate_argocd_metrics_controller_test.go
@@ -47,7 +47,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 
 		}
 
-		It("verifies Argo CD metrics can be disabled and re-enabled", func() {
+		It("verifies Argo CD metrics can be disabled and re-enabled", Label("openshift"), func() {
 
 			By("verifying Argo CD metrics are enabled by default in openshift-gitops")
 
diff --git a/test/openshift/e2e/ginkgo/sequential/1-107_validate_redis_scc_test.go b/test/openshift/e2e/ginkgo/sequential/1-107_validate_redis_scc_test.go
index 4fdb5e1e7ab..b3577ea1cf5 100644
--- a/test/openshift/e2e/ginkgo/sequential/1-107_validate_redis_scc_test.go
+++ b/test/openshift/e2e/ginkgo/sequential/1-107_validate_redis_scc_test.go
@@ -32,7 +32,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			ctx = context.Background()
 		})
 
-		It("verifies that when Argo CD has HA enabled that the redis pods use restricted-v2 security policy", func() {
+		It("verifies that when Argo CD has HA enabled that the redis pods use restricted-v2 security policy", Label("openshift"), func() {
 
 			By("verifying we are running on a cluster with at least 3 nodes. This is required for Redis HA")
 			nodeFixture.ExpectHasAtLeastXNodes(3)
diff --git a/test/openshift/e2e/ginkgo/sequential/1-110_validate_podsecurity_alerts_test.go b/test/openshift/e2e/ginkgo/sequential/1-110_validate_podsecurity_alerts_test.go
index 4db69db8a75..41b06b266b7 100644
--- a/test/openshift/e2e/ginkgo/sequential/1-110_validate_podsecurity_alerts_test.go
+++ b/test/openshift/e2e/ginkgo/sequential/1-110_validate_podsecurity_alerts_test.go
@@ -28,7 +28,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			fixture.EnsureSequentialCleanSlate()
 		})
 
-		It("verifies openshift-gitops: operator sets podSecurityLabelSync and OpenShift sets audit to restricted", func() {
+		It("verifies openshift-gitops: operator sets podSecurityLabelSync and OpenShift sets audit to restricted", Label("openshift"), func() {
 			gitopsNS := &corev1.Namespace{
 				ObjectMeta: metav1.ObjectMeta{
 					Name: "openshift-gitops",
diff --git a/test/openshift/e2e/ginkgo/sequential/1-111_validate_default_argocd_route_test.go b/test/openshift/e2e/ginkgo/sequential/1-111_validate_default_argocd_route_test.go
index c88f392faf6..7040398b9a9 100644
--- a/test/openshift/e2e/ginkgo/sequential/1-111_validate_default_argocd_route_test.go
+++ b/test/openshift/e2e/ginkgo/sequential/1-111_validate_default_argocd_route_test.go
@@ -24,7 +24,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			fixture.EnsureSequentialCleanSlate()
 		})
 
-		It("ensuring that default openshift-gitops instance has expected default Argo CD server route, and that it is possible to modify the values on that default instance", func() {
+		It("ensuring that default openshift-gitops instance has expected default Argo CD server route, and that it is possible to modify the values on that default instance", Label("openshift"), func() {
 
 			By("verifying route of openshift-gitops Argo CD instance has expected values")
 			openshiftArgoCD, err := argocdFixture.GetOpenShiftGitOpsNSArgoCD()
diff --git a/test/openshift/e2e/ginkgo/sequential/1-112_validate_rollout_plugin_support_test.go b/test/openshift/e2e/ginkgo/sequential/1-112_validate_rollout_plugin_support_test.go
index adc3625bb1d..1ca0ae4ebff 100644
--- a/test/openshift/e2e/ginkgo/sequential/1-112_validate_rollout_plugin_support_test.go
+++ b/test/openshift/e2e/ginkgo/sequential/1-112_validate_rollout_plugin_support_test.go
@@ -35,7 +35,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			ctx = context.Background()
 		})
 
-		It("verifies that custom traffic management and metrics plugins can be added to Argo Rollouts instance via RolloutManager CR", func() {
+		It("verifies that custom traffic management and metrics plugins can be added to Argo Rollouts instance via RolloutManager CR", Label("openshift"), func() {
 
 			By("creating a new Argo Rollouts instance in openshift-gitops namespace, containing a custom traffic management plugin and a custom metrics plugin")
 			rm := &rolloutmanagerv1alpha1.RolloutManager{
diff --git a/test/openshift/e2e/ginkgo/sequential/1-114_validate_imagepullpolicy_test.go b/test/openshift/e2e/ginkgo/sequential/1-114_validate_imagepullpolicy_test.go
index e572412a9b1..e09942baadf 100644
--- a/test/openshift/e2e/ginkgo/sequential/1-114_validate_imagepullpolicy_test.go
+++ b/test/openshift/e2e/ginkgo/sequential/1-114_validate_imagepullpolicy_test.go
@@ -49,7 +49,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			ctx = context.Background()
 		})
 
-		It("verifies that imagePullPolicy from ArgoCD CR spec is propagated to all ArgoCD workload resources", func() {
+		It("verifies that imagePullPolicy from ArgoCD CR spec is propagated to all ArgoCD workload resources", Label("openshift"), func() {
 
 			By("creating a test namespace for ArgoCD instance")
 			ns, cleanupFunc := fixture.CreateRandomE2ETestNamespaceWithCleanupFunc()
@@ -138,7 +138,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 
 		})
 
-		It("verifies that imagePullPolicy works correctly on default openshift-gitops ArgoCD instance", func() {
+		It("verifies that imagePullPolicy works correctly on default openshift-gitops ArgoCD instance", Label("openshift"), func() {
 
 			openshiftGitopsArgoCD, err := argocdFixture.GetOpenShiftGitOpsNSArgoCD()
 			Expect(err).ToNot(HaveOccurred())
@@ -194,7 +194,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 
 		})
 
-		It("verifies default imagePullPolicy is applied to all ArgoCD workload resources when not specified in either CR spec or subscription", func() {
+		It("verifies default imagePullPolicy is applied to all ArgoCD workload resources when not specified in either CR spec or subscription", Label("openshift"), func() {
 
 			openshiftGitopsArgoCD, err := argocdFixture.GetOpenShiftGitOpsNSArgoCD()
 			Expect(err).ToNot(HaveOccurred())
diff --git a/test/openshift/e2e/ginkgo/sequential/1-120_repo_server_system_ca_trust.go b/test/openshift/e2e/ginkgo/sequential/1-120_repo_server_system_ca_trust.go
index 7c7cc1c3cf5..ae5f20a3a57 100644
--- a/test/openshift/e2e/ginkgo/sequential/1-120_repo_server_system_ca_trust.go
+++ b/test/openshift/e2e/ginkgo/sequential/1-120_repo_server_system_ca_trust.go
@@ -100,7 +100,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			purgeCtbs()
 		})
 
-		It("ensures that missing Secret aborts startup", func() {
+		It("ensures that missing Secret aborts startup", Label("openshift"), func() {
 			ns, cleanupNs = fixture.CreateRandomE2ETestNamespaceWithCleanupFunc()
 
 			By("creating Argo CD instance with missing Secret")
@@ -162,7 +162,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			)))
 		})
 
-		It("ensures that CMs and Secrets are trusted in repo-server and plugins", func() {
+		It("ensures that CMs and Secrets are trusted in repo-server and plugins", Label("openshift"), func() {
 			ns, cleanupNs = fixture.CreateRandomE2ETestNamespaceWithCleanupFunc()
 
 			cmCert := createCmFromCert(ns, getCACert("github.com"))
@@ -210,7 +210,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			verifyCorrectlyConfiguredTrust(ns)
 		})
 
-		It("ensures that 0 trusted certs with DropImageCertificates trusts nothing", func() {
+		It("ensures that 0 trusted certs with DropImageCertificates trusts nothing", Label("openshift"), func() {
 			ns, cleanupNs = fixture.CreateRandomE2ETestNamespaceWithCleanupFunc()
 
 			By("creating Argo CD instance with empty system trust")
@@ -242,7 +242,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			Expect(trustedHelmApp).Should(appFixture.HaveSyncStatusCode(appv1alpha1.SyncStatusCodeUnknown))
 		})
 
-		It("ensures that empty trust keeps image certs in place", func() {
+		It("ensures that empty trust keeps image certs in place", Label("openshift"), func() {
 			ns, cleanupNs = fixture.CreateRandomE2ETestNamespaceWithCleanupFunc()
 
 			By("creating Argo CD instance with empty system trust")
@@ -256,7 +256,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			Expect(repoServerSystemCaTrust(ns)).Should(trustCerts(BeNumerically(">", 100), Not(BeEmpty())))
 		})
 
-		It("ensures that Secrets and ConfigMaps get reconciled", func() {
+		It("ensures that Secrets and ConfigMaps get reconciled", Label("openshift"), func() {
 			ns, cleanupNs = fixture.CreateRandomE2ETestNamespaceWithCleanupFunc()
 
 			By("creating Argo CD instance with empty system trust, but full of anticipation")
diff --git a/test/openshift/e2e/ginkgo/sequential/1-120_validate_running_must_gather.go b/test/openshift/e2e/ginkgo/sequential/1-120_validate_running_must_gather.go
index 81b66ad2cd8..114ceaf840d 100644
--- a/test/openshift/e2e/ginkgo/sequential/1-120_validate_running_must_gather.go
+++ b/test/openshift/e2e/ginkgo/sequential/1-120_validate_running_must_gather.go
@@ -62,7 +62,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			ctx = context.Background()
 		})
 
-		It("verified the files collected for must gather are valid", func() {
+		It("verified the files collected for must gather are valid", Label("openshift"), func() {
 			By("creating namespace-scoped Argo CD instance")
 			ns, nsCleanup := fixture.CreateRandomE2ETestNamespaceWithCleanupFunc()
 			defer nsCleanup()
diff --git a/test/openshift/e2e/ginkgo/sequential/1-121-valiate_resource_constraints_gitopsservice_test.go b/test/openshift/e2e/ginkgo/sequential/1-121-valiate_resource_constraints_gitopsservice_test.go
index d28b82549ef..6248abc83f6 100644
--- a/test/openshift/e2e/ginkgo/sequential/1-121-valiate_resource_constraints_gitopsservice_test.go
+++ b/test/openshift/e2e/ginkgo/sequential/1-121-valiate_resource_constraints_gitopsservice_test.go
@@ -73,7 +73,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			ctx = context.Background()
 		})
 
-		It("validates that GitOpsService can take in custom resource constraints", func() {
+		It("validates that GitOpsService can take in custom resource constraints", Label("openshift"), func() {
 			csv := clusterserviceversion.Get(ctx, k8sClient)
 			Expect(csv).ToNot(BeNil())
 			defer func() { Expect(fixture.RemoveDynamicPluginFromCSV(ctx, k8sClient)).To(Succeed()) }()
@@ -154,7 +154,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			verifyResourceConstraints(k8sClient, "cluster", expectedReq, expectedLim)
 		})
 
-		It("validates that GitOpsService can update resource constraints", func() {
+		It("validates that GitOpsService can update resource constraints", Label("openshift"), func() {
 			csv := clusterserviceversion.Get(ctx, k8sClient)
 			Expect(csv).ToNot(BeNil())
 			defer func() { Expect(fixture.RemoveDynamicPluginFromCSV(ctx, k8sClient)).To(Succeed()) }()
@@ -225,7 +225,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			verifyResourceConstraints(k8sClient, "cluster", expectedReq, expectedLim)
 		})
 
-		It("validates gitops plugin and backend can have different resource constraints", func() {
+		It("validates gitops plugin and backend can have different resource constraints", Label("openshift"), func() {
 			csv := clusterserviceversion.Get(ctx, k8sClient)
 			Expect(csv).ToNot(BeNil())
 			defer func() { Expect(fixture.RemoveDynamicPluginFromCSV(ctx, k8sClient)).To(Succeed()) }()
diff --git a/test/openshift/e2e/ginkgo/sequential/1-122_validate_namespace_test.go b/test/openshift/e2e/ginkgo/sequential/1-122_validate_namespace_test.go
index bab342cb7bd..201959a1572 100644
--- a/test/openshift/e2e/ginkgo/sequential/1-122_validate_namespace_test.go
+++ b/test/openshift/e2e/ginkgo/sequential/1-122_validate_namespace_test.go
@@ -71,7 +71,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			}
 		})
 
-		It("Should validate namespace for new resources", func() {
+		It("Should validate namespace for new resources", Label("openshift"), func() {
 
 			argoNamespace, cleanupArgoNamespace = fixture.CreateRandomE2ETestNamespaceWithCleanupFunc()
 			sourceNamespace, cleanupSourceNamespace = fixture.CreateRandomE2ETestNamespaceWithCleanupFunc()
@@ -163,7 +163,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 
 		})
 
-		It("Should validate namespace for existing resources", func() {
+		It("Should validate namespace for existing resources", Label("openshift"), func() {
 
 			argoNamespace, cleanupArgoNamespace = fixture.CreateRandomE2ETestNamespaceWithCleanupFunc()
 			sourceNamespace, cleanupSourceNamespace = fixture.CreateRandomE2ETestNamespaceWithCleanupFunc()
diff --git a/test/openshift/e2e/ginkgo/sequential/1-123_validate_list_order_comparison_test.go b/test/openshift/e2e/ginkgo/sequential/1-123_validate_list_order_comparison_test.go
index 929001ef6d8..a4ccaa7048d 100644
--- a/test/openshift/e2e/ginkgo/sequential/1-123_validate_list_order_comparison_test.go
+++ b/test/openshift/e2e/ginkgo/sequential/1-123_validate_list_order_comparison_test.go
@@ -117,7 +117,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			fixture.OutputDebugOnFail(openshiftGitopsNamespace)
 		})
 
-		It("Should not trigger updates when only list order differs", func() {
+		It("Should not trigger updates when only list order differs", Label("openshift"), func() {
 			gitopsService := &gitopsoperatorv1alpha1.GitopsService{
 				ObjectMeta: metav1.ObjectMeta{Name: "cluster"},
 			}
@@ -214,7 +214,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 
 		})
 
-		It("Should trigger updates when actual changes are made", func() {
+		It("Should trigger updates when actual changes are made", Label("openshift"), func() {
 			gitopsService := &gitopsoperatorv1alpha1.GitopsService{
 				ObjectMeta: metav1.ObjectMeta{Name: "cluster"},
 			}

From c70a4330622d4289b3e33f4b953533ece1c68a10 Mon Sep 17 00:00:00 2001
From: Anand Kumar Singh <anandrkskd@gmail.com>
Date: Mon, 13 Jul 2026 19:46:52 +0530
Subject: [PATCH 2/2] remove debugging Fit from tests

Signed-off-by: Anand Kumar Singh <anandrkskd@gmail.com>
---
 .../e2e/ginkgo/parallel/1-031_validate_toolchain_test.go        | 2 +-
 .../1-066_validate_redis_secure_comm_no_autotls_no_ha_test.go   | 2 +-
 .../ginkgo/parallel/1-121_validate_custom_labels_rollouts.go    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/openshift/e2e/ginkgo/parallel/1-031_validate_toolchain_test.go b/test/openshift/e2e/ginkgo/parallel/1-031_validate_toolchain_test.go
index a1cdb496f52..a0e5863a2a3 100644
--- a/test/openshift/e2e/ginkgo/parallel/1-031_validate_toolchain_test.go
+++ b/test/openshift/e2e/ginkgo/parallel/1-031_validate_toolchain_test.go
@@ -83,7 +83,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 			return podName, nil
 		}
 
-		FIt("verifies that toolchain versions have the expected values", func() {
+		It("verifies that toolchain versions have the expected values", func() {
 
 			// create a new namespace
 			ns, cleanupFunc := fixture.CreateNamespaceWithCleanupFunc("test-1-031-toolchain")
diff --git a/test/openshift/e2e/ginkgo/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha_test.go b/test/openshift/e2e/ginkgo/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha_test.go
index a46ee865094..aa867da528f 100644
--- a/test/openshift/e2e/ginkgo/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha_test.go
+++ b/test/openshift/e2e/ginkgo/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha_test.go
@@ -60,7 +60,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 			fixture.OutputDebugOnFail(ns)
 		})
 
-		FIt("validates that Argo CD components correctly inherit 'argocd-operator-redis-tls' Secret once it is created", func() {
+		It("validates that Argo CD components correctly inherit 'argocd-operator-redis-tls' Secret once it is created", func() {
 
 			By("creating simple namespace-scoped Argo CD instance")
 			ns, cleanupFunc = fixture.CreateRandomE2ETestNamespaceWithCleanupFunc()
diff --git a/test/openshift/e2e/ginkgo/parallel/1-121_validate_custom_labels_rollouts.go b/test/openshift/e2e/ginkgo/parallel/1-121_validate_custom_labels_rollouts.go
index 8b723bb1ae0..a149615d59f 100644
--- a/test/openshift/e2e/ginkgo/parallel/1-121_validate_custom_labels_rollouts.go
+++ b/test/openshift/e2e/ginkgo/parallel/1-121_validate_custom_labels_rollouts.go
@@ -46,7 +46,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 			ctx = context.Background()
 		})
 
-		FIt("ensures that custom labels set by the operator are added to Argo Rollouts resources", func() {
+		It("ensures that custom labels set by the operator are added to Argo Rollouts resources", func() {
 
 			By("creating namespace-scoped RolloutManager instance")
 			rolloutManager := &rolloutmanagerv1alpha1.RolloutManager{