UPSTREAM: <carry>: Use oc client for running e2e tests

Expose docker-registry to e2e test code by creating Openshift route

Author: pedjak

openshift/Makefile

@@ -33,20 +33,20 @@ verify-manifests: manifests
 
 E2E_REGISTRY_NAME=docker-registry
 E2E_REGISTRY_NAMESPACE=operator-controller-e2e
-export LOCAL_REGISTRY_HOST := $(E2E_REGISTRY_NAME).$(E2E_REGISTRY_NAMESPACE).svc:5000
 export CLUSTER_REGISTRY_HOST := $(E2E_REGISTRY_NAME).$(E2E_REGISTRY_NAMESPACE).svc:5000
 export REG_PKG_NAME := registry-operator
 export E2E_TEST_CATALOG_V1 := e2e/test-catalog:v1
 export E2E_TEST_CATALOG_V2 := e2e/test-catalog:v2
-export CATALOG_IMG := $(LOCAL_REGISTRY_HOST)/$(E2E_TEST_CATALOG_V1)
+export CATALOG_IMG := $(CLUSTER_REGISTRY_HOST)/$(E2E_TEST_CATALOG_V1)
 
 # Order matters here, the ".../registries.conf" entry must be last.
-export DOWNSTREAM_E2E_FLAGS := -count=1 -v -skip 'TestClusterExtensionInstallReResolvesWhenNewCatalog|TestClusterExtensionInstallRegistryDynamic|TestClusterExtensionInstallRegistry/package_requires_mirror_registry_configuration_in_/etc/containers/registries.conf'
+export DOWNSTREAM_E2E_FLAGS := -count=1 -v
 .PHONY: test-e2e
 test-e2e: ## Run the e2e tests.
 	$(DIR)/operator-controller/build-test-registry.sh $(E2E_REGISTRY_NAMESPACE) $(E2E_REGISTRY_NAME) $(E2E_REGISTRY_IMAGE)
 	cd $(DIR)/../; \
-	go test $(DOWNSTREAM_E2E_FLAGS) ./test/e2e/...;
+	LOCAL_REGISTRY_HOST=$$(oc get route $(E2E_REGISTRY_NAME) -n $(E2E_REGISTRY_NAMESPACE) -o jsonpath='{.spec.host}') \
+	go test $(DOWNSTREAM_E2E_FLAGS) ./test/e2e/features_test.go --godog.tags="~@mirrored-registry && ~@catalog-updates" --k8s.cli=oc
 
 export DOWNSTREAM_EXPERIMENTAL_E2E_FLAGS := -count=1 -v
 .PHONY: test-experimental-e2e

openshift/operator-controller/build-test-registry.sh

@@ -81,7 +81,7 @@ spec:
   - name: http
     port: 5000
     targetPort: 5000
-  type: NodePort
+  type: ClusterIP
 EOF
 
 oc wait --for=condition=Available -n "${namespace}" "deploy/${name}" --timeout=60s
@@ -118,3 +118,7 @@ spec:
 EOF
 
 oc wait --for=condition=Complete -n "${namespace}" "job/${name}-push" --timeout=60s
+
+oc create route passthrough ${name} --service ${name} -n ${namespace}
+
+oc get route ${name} -n ${namespace} -o yaml