Skip to content

Commit

Permalink
Merge pull request knative#658 from dsimansk/release-v0.19.1-update
Browse files Browse the repository at this point in the history
[release-v0.19.1] Fix deprecated registry
  • Loading branch information
stevekuznetsov authored Mar 26, 2021
2 parents 823826a + e420741 commit 8970f14
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion openshift/ci-operator/build-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
6 changes: 3 additions & 3 deletions openshift/e2e-common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
}
Expand Down

0 comments on commit 8970f14

Please sign in to comment.