From e4207414bb257fc9fe1a6b2d28fecbabe0ee6d70 Mon Sep 17 00:00:00 2001 From: David Simansky Date: Fri, 26 Mar 2021 15:56:35 +0100 Subject: [PATCH] [release-v0.19.1] Fix deprecated registry --- openshift/ci-operator/build-image/Dockerfile | 2 +- openshift/e2e-common.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openshift/ci-operator/build-image/Dockerfile b/openshift/ci-operator/build-image/Dockerfile index b1e8720d35..36861d0ed6 100644 --- a/openshift/ci-operator/build-image/Dockerfile +++ b/openshift/ci-operator/build-image/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. # Dockerfile to bootstrap build and test in openshift-ci -FROM registry.svc.ci.openshift.org/openshift/release:golang-1.14 +FROM registry.ci.openshift.org/openshift/release:golang-1.14 # Add kubernetes repository ADD openshift/ci-operator/build-image/kubernetes.repo /etc/yum.repos.d/ diff --git a/openshift/e2e-common.sh b/openshift/e2e-common.sh index 0adefe2553..6a1fdd7d8c 100755 --- a/openshift/e2e-common.sh +++ b/openshift/e2e-common.sh @@ -37,11 +37,11 @@ if [ -n "$OPENSHIFT_BUILD_NAMESPACE" ]; then elif [ -n "$DOCKER_REPO_OVERRIDE" ]; then readonly TEST_IMAGE_TEMPLATE="${DOCKER_REPO_OVERRIDE}/{{.Name}}" elif [ -n "$BRANCH" ]; then - readonly TEST_IMAGE_TEMPLATE="registry.svc.ci.openshift.org/openshift/${BRANCH}:knative-client-test-{{.Name}}" + readonly TEST_IMAGE_TEMPLATE="registry.ci.openshift.org/openshift/${BRANCH}:knative-client-test-{{.Name}}" elif [ -n "$TEMPLATE" ]; then readonly TEST_IMAGE_TEMPLATE="$TEMPLATE" else - readonly TEST_IMAGE_TEMPLATE="registry.svc.ci.openshift.org/openshift/knative-nightly:knative-client-test-{{.Name}}" + readonly TEST_IMAGE_TEMPLATE="registry.ci.openshift.org/openshift/knative-nightly:knative-client-test-{{.Name}}" fi env @@ -161,7 +161,7 @@ install_knative_serving_branch() { pushd /tmp/knative-serving source "openshift/e2e-common.sh" - IMAGE_FORMAT='registry.svc.ci.openshift.org/openshift/knative-nightly:${component}' install_knative || failed=1 + IMAGE_FORMAT='registry.ci.openshift.org/openshift/knative-nightly:${component}' install_knative || failed=1 popd return $failed }