jgwest · Oct 14, 2026 · Oct 15, 2026 · Oct 15, 2026 · Oct 15, 2026 · jgwest
diff --git a/Makefile b/Makefile
@@ -139,29 +139,6 @@ vet: ## Run go vet against code.
 test-all: manifests generate fmt vet ## Run all tests.
 	go test -timeout 1h ./... -coverprofile cover.out
 
-.PHONY: test-e2e
-test-e2e: manifests generate fmt vet ## Run e2e tests.
-	REDIS_CONFIG_PATH="build/redis" go test -p 1 -timeout 1h ./test/e2e -coverprofile cover.out -ginkgo.v
-	REDIS_CONFIG_PATH="build/redis" go test -p 1 -timeout 1h ./test/nondefaulte2e -coverprofile cover.out -ginkgo.v
-
-.PHONY: test-metrics
-test-metrics:
-	go test -timeout 30m ./test/e2e -ginkgo.focus="Argo CD metrics controller" -coverprofile cover.out -ginkgo.v
-
-.PHONY: test-route
-test-route:
-	go test -timeout 30m ./test/e2e -ginkgo.focus="Argo CD ConsoleLink controller" -coverprofile cover.out -ginkgo.v
-
-
-.PHONY: test-gitopsservice
-test-gitopsservice:
-	go test -p 1 -timeout 1h ./test/e2e -ginkgo.focus="GitOpsServiceController" -coverprofile cover.out -ginkgo.v
-
-
-.PHONY: test-gitopsservice-nondefault
-test-gitopsservice-nondefault:
-	go test -p 1 -timeout 30m ./test/nondefaulte2e -ginkgo.focus="GitOpsServiceNoDefaultInstall" -coverprofile cover.out -ginkgo.v
-
 .PHONY: test
 test: manifests generate fmt vet ## Run unit tests.
 	cd argocd-operator && make test

diff --git a/README.md b/README.md
@@ -60,7 +60,7 @@ make test
 #### e2e tests
 
 ```
-make test-e2e
+make e2e-tests-ginkgo
 ```
 
 #### Accessing redacted OpenShift CI logs

diff --git a/go.mod b/go.mod
@@ -24,7 +24,6 @@ require (
 	github.com/openshift/api v0.0.0-20260619095050-5346161d1bf2
 	github.com/openshift/controller-runtime-common v0.0.0-20260428152732-64ee174f5e2e
 	github.com/operator-framework/api v0.17.5
-	github.com/pkg/errors v0.9.1
 	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.74.0
 	github.com/stretchr/testify v1.11.1
 	go.uber.org/zap v1.28.0
@@ -148,6 +147,7 @@ require (
 	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
 	github.com/pjbgf/sha1cd v0.6.0 // indirect
 	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
+	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/prometheus/client_golang v1.24.1 // indirect
 	github.com/prometheus/client_model v0.6.2 // indirect

diff --git a/scripts/openshiftci-presubmit-all-tests.sh b/scripts/openshiftci-presubmit-all-tests.sh
@@ -26,6 +26,6 @@ cd hack/upgrade-rollouts-manager
 go mod vendor
 cd ../..
 
-# Run e2e test
-make test-e2e
+
+# TODO: this file appears to no longer be needed.
 
diff --git a/test/appcrs/build_appcr.yaml b/test/appcrs/build_appcr.yaml
diff --git a/test/appcrs/image_appcr.yaml b/test/appcrs/image_appcr.yaml
diff --git a/test/appcrs/nginx_appcr.yaml b/test/appcrs/nginx_appcr.yaml
diff --git a/test/appcrs/nginx_default_ns_appcr.yaml b/test/appcrs/nginx_default_ns_appcr.yaml
diff --git a/test/appcrs/non_default_appcr.yaml b/test/appcrs/non_default_appcr.yaml
diff --git a/test/appcrs/scheduler_appcr.yaml b/test/appcrs/scheduler_appcr.yaml
diff --git a/test/e2e/argocd_route_test.go b/test/e2e/argocd_route_test.go