diff --git a/ci-operator/step-registry/mirror-images/by-oc-adm-in-bastion/mirror-images-by-oc-adm-in-bastion-commands.sh b/ci-operator/step-registry/mirror-images/by-oc-adm-in-bastion/mirror-images-by-oc-adm-in-bastion-commands.sh index 7f0d3f2d7e112..b9a30fd44743c 100755 --- a/ci-operator/step-registry/mirror-images/by-oc-adm-in-bastion/mirror-images-by-oc-adm-in-bastion-commands.sh +++ b/ci-operator/step-registry/mirror-images/by-oc-adm-in-bastion/mirror-images-by-oc-adm-in-bastion-commands.sh @@ -22,17 +22,19 @@ if [ ! -f "${SHARED_DIR}/mirror_registry_url" ]; then fi echo "MIRROR_REGISTRY_HOST: $MIRROR_REGISTRY_HOST" +readable_version=$(oc adm release info "${OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE}" -o jsonpath='{.metadata.version}') +echo "readable_version: $readable_version" + # target release target_release_image="${MIRROR_REGISTRY_HOST}/${OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE#*/}" target_release_image_repo="${target_release_image%:*}" target_release_image_repo="${target_release_image_repo%@sha256*}" +# ensure mirror release image by tag name, refer to https://github.com/openshift/oc/pull/1331 +target_release_image="${target_release_image_repo}:${readable_version}" echo "target_release_image: $target_release_image" echo "target_release_image_repo: $target_release_image_repo" -readable_version=$(oc adm release info "${OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE}" --output=json | jq .metadata.version) -echo "readable_version: $readable_version" - # since ci-operator gives steps KUBECONFIG pointing to cluster under test under some circumstances, # unset KUBECONFIG to ensure this step always interact with the build farm. unset KUBECONFIG diff --git a/ci-operator/step-registry/mirror-images/by-oc-adm/mirror-images-by-oc-adm-commands.sh b/ci-operator/step-registry/mirror-images/by-oc-adm/mirror-images-by-oc-adm-commands.sh index febd384ead87d..f737ccc28794f 100755 --- a/ci-operator/step-registry/mirror-images/by-oc-adm/mirror-images-by-oc-adm-commands.sh +++ b/ci-operator/step-registry/mirror-images/by-oc-adm/mirror-images-by-oc-adm-commands.sh @@ -20,17 +20,19 @@ if [ ! -f "${SHARED_DIR}/mirror_registry_url" ]; then fi echo "MIRROR_REGISTRY_HOST: $MIRROR_REGISTRY_HOST" +readable_version=$(oc adm release info "${OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE}" -o jsonpath='{.metadata.version}') +echo "readable_version: $readable_version" + # target release target_release_image="${MIRROR_REGISTRY_HOST}/${OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE#*/}" target_release_image_repo="${target_release_image%:*}" target_release_image_repo="${target_release_image_repo%@sha256*}" +# ensure mirror release image by tag name, refer to https://github.com/openshift/oc/pull/1331 +target_release_image="${target_release_image_repo}:${readable_version}" echo "target_release_image: $target_release_image" echo "target_release_image_repo: $target_release_image_repo" -readable_version=$(oc adm release info "${OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE}" --output=json | jq .metadata.version) -echo "readable_version: $readable_version" - # since ci-operator gives steps KUBECONFIG pointing to cluster under test under some circumstances, # unset KUBECONFIG to ensure this step always interact with the build farm. unset KUBECONFIG