Update

Author: jgwest

Makefile

@@ -166,7 +166,7 @@ e2e-tests-sequential-ginkgo: ginkgo ## Runs kuttl e2e sequential tests
 .PHONY: e2e-tests-parallel-ginkgo ## Runs kuttl e2e parallel tests, (Defaults to 5 runs at a time)
 e2e-tests-parallel-ginkgo: ginkgo
 	@echo "Running GitOps Operator parallel Ginkgo E2E tests..."
-	$(GINKGO_CLI) -p --trace --timeout 30m -procs=5 --slow-spec-threshold=5m  -v  -r ./test/openshift/e2e/ginkgo/parallel 
+	$(GINKGO_CLI) -p -v -procs=5 --trace --timeout 30m -r ./test/openshift/e2e/ginkgo/parallel 
 
 .PHONY: e2e-tests-sequential
 e2e-tests-sequential: 
@@ -277,7 +277,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.1.5)
+	$(call go-get-tool,$(GINKGO_CLI),github.com/onsi/ginkgo/v2/ginkgo@v2.22.2)
 
 
 # go-get-tool will 'go install' any package $2 and install it to $1.

test/e2e/argocd_metrics_test.go

@@ -60,7 +60,7 @@ var _ = Describe("Argo CD metrics controller", func() {
 	Context("Check if monitoring resources are created", func() {
 		It("Role is created", func() {
 
-			openShiftGitOpsArgoCD := argov1beta1api.ArgoCD{
+			openShiftGitOpsArgoCD := &argov1beta1api.ArgoCD{
 				ObjectMeta: metav1.ObjectMeta{Name: "openshift-gitops", Namespace: "openshift-gitops"},
 			}
 			Eventually(openShiftGitOpsArgoCD, "5m", "5s").Should(argocdFixture.BeAvailable())

test/openshift/e2e/ginkgo/fixture/statefulset/fixture.go

@@ -263,13 +263,13 @@ func fetchStatefulSet(f func(*appsv1.StatefulSet) bool) matcher.GomegaMatcher {
 
 		k8sClient, _, err := utils.GetE2ETestKubeClientWithError()
 		if err != nil {
-			GinkgoWriter.Println(err)
+			GinkgoWriter.Println("fetchStatefulSet:", err)
 			return false
 		}
 
 		err = k8sClient.Get(context.Background(), client.ObjectKeyFromObject(ss), ss)
 		if err != nil {
-			GinkgoWriter.Println(err)
+			GinkgoWriter.Println("fetchStatefulSet:", err)
 			return false
 		}
 

test/openshift/e2e/ginkgo/parallel/1-063_validate_statefulset_restart_test.go

@@ -52,6 +52,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 			By("creating simple namespace-scoped Argo CD instance")
 			ns, cleanupFunc := fixture.CreateRandomE2ETestNamespaceWithCleanupFunc()
 			defer cleanupFunc()
+			defer fixture.OutputDebugOnFail()
 
 			argoCD := &argov1beta1api.ArgoCD{
 				ObjectMeta: metav1.ObjectMeta{Name: "example-argocd", Namespace: ns.Name},