[Monorepo]: Combine upgrade e2e tests from catalogd into operator-controller

Author: camilamacedo86

.github/workflows/catalogd-e2e.yaml

@@ -226,26 +226,6 @@ test-e2e: GO_BUILD_FLAGS := -cover
 test-e2e: CATALOGD_KUSTOMIZE_BUILD_DIR := catalogd/config/overlays/e2e
 test-e2e: run image-registry e2e e2e-coverage kind-clean #HELP Run e2e test suite on local kind cluster
 
-
-## image-registry target has to come after run-latest-release,
-## because the image-registry depends on the olm-ca issuer.
-.PHONY: test-catalogd-upgrade-e2e
-test-catalogd-upgrade-e2e: export TEST_CLUSTER_CATALOG_NAME := test-catalog
-test-catalogd-upgrade-e2e: export TEST_CLUSTER_CATALOG_IMAGE := docker-registry.catalogd-e2e.svc:5000/test-catalog:e2e
-test-catalogd-upgrade-e2e: ISSUER_KIND=ClusterIssuer
-test-catalogd-upgrade-e2e: ISSUER_NAME=olmv1-ca
-test-catalogd-upgrade-e2e: kind-cluster docker-build kind-load run-latest-release catalogd-image-registry catalogd-pre-upgrade-setup kind-deploy catalogd-post-upgrade-checks kind-clean ## Run upgrade e2e tests on a local kind cluster
-
-.PHONY: catalogd-post-upgrade-checks
-catalogd-post-upgrade-checks:
-	$(GINKGO) $(E2E_FLAGS) -trace -vv $(FOCUS) test/catalogd-upgrade-e2e
-
-catalogd-pre-upgrade-setup:
-	./test/tools/imageregistry/pre-upgrade-setup.sh ${TEST_CLUSTER_CATALOG_IMAGE} ${TEST_CLUSTER_CATALOG_NAME}
-
-catalogd-image-registry: ## Setup in-cluster image registry
-	./test/tools/imageregistry/registry.sh $(ISSUER_KIND) $(ISSUER_NAME)
-
 .PHONY: extension-developer-e2e
 extension-developer-e2e: KUSTOMIZE_BUILD_DIR := config/overlays/cert-manager
 extension-developer-e2e: KIND_CLUSTER_NAME := operator-controller-ext-dev-e2e  #EXHELP Run extension-developer e2e on local kind cluster
@@ -268,6 +248,9 @@ post-upgrade-checks:
 test-upgrade-e2e: KIND_CLUSTER_NAME := operator-controller-upgrade-e2e
 test-upgrade-e2e: export TEST_CLUSTER_CATALOG_NAME := test-catalog
 test-upgrade-e2e: export TEST_CLUSTER_EXTENSION_NAME := test-package
+test-upgrade-e2e: export TEST_CLUSTER_CATALOG_IMAGE := docker-registry.operator-controller-e2e.svc.cluster.local:5000/test-catalog:e2e
+test-upgrade-e2e: ISSUER_KIND=ClusterIssuer
+test-upgrade-e2e: ISSUER_NAME=olmv1-ca
 test-upgrade-e2e: kind-cluster run-latest-release image-registry pre-upgrade-setup docker-build kind-load kind-deploy post-upgrade-checks kind-clean #HELP Run upgrade e2e tests on a local kind cluster
 
 .PHONY: e2e-coverage