chore: update E2E tests for latest version

Signed-off-by: Jonathan West <[email protected]>

Author: jgwest

test/openshift/e2e/ginkgo/parallel/1-031_validate_toolchain_test.go

@@ -87,7 +87,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 			// These variables need to be maintained according to the component matrix: https://spaces.redhat.com/display/GITOPS/GitOps+Component+Matrix
 			expected_kustomizeVersion := "v5.7.0"
 			expected_helmVersion := "v3.18.4"
-			expected_argocdVersion := "v3.1.1"
+			expected_argocdVersion := "v3.1.9"
 
 			var expected_dexVersion string
 			var expected_redisVersion string

test/openshift/e2e/ginkgo/sequential/1-105_validate_label_selector_test.go

@@ -22,8 +22,10 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 	Context("1-105_validate_label_selector", func() {
 
 		var (
-			ctx       context.Context
-			k8sClient client.Client
+			ctx         context.Context
+			k8sClient   client.Client
+			ns          *corev1.Namespace
+			cleanupFunc func()
 		)
 
 		BeforeEach(func() {
@@ -33,6 +35,14 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			ctx = context.Background()
 		})
 
+		AfterEach(func() {
+			defer cleanupFunc()
+
+			fixture.OutputDebugOnFail(ns)
+
+			fixture.RestoreSubcriptionToDefault()
+		})
+
 		It("ensures that ARGOCD_LABEL_SELECTOR controls which ArgoCD CRs are reconciled via operator", func() {
 
 			if fixture.EnvLocalRun() {
@@ -43,13 +53,9 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			By("adding ARGOCD_LABEL_SELECTOR foo=bar to Operator")
 			fixture.SetEnvInOperatorSubscriptionOrDeployment("ARGOCD_LABEL_SELECTOR", "foo=bar")
 
-			defer func() { // Restore subscription to default after test
-				fixture.RestoreSubcriptionToDefault()
-			}()
-
-			By("creating new namespace-scoped ArgoCD instance in test-argocd")
+			By("creating new namespace-scoped ArgoCD instance")
 
-			ns := fixture.CreateNamespace("test-argocd")
+			ns, cleanupFunc = fixture.CreateRandomE2ETestNamespaceWithCleanupFunc()
 
 			argoCD := &argov1beta1api.ArgoCD{
 				ObjectMeta: metav1.ObjectMeta{