From 8e93f2362a2cc72b856f1011d37ae6ba64b6e39a Mon Sep 17 00:00:00 2001 From: karmab Date: Fri, 31 Jan 2025 11:27:05 +0100 Subject: [PATCH] openshift disconnected: fix 03_mirror.sh --- scripts/05_mirror.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/scripts/05_mirror.sh b/scripts/05_mirror.sh index 6513c7d..f0e861c 100755 --- a/scripts/05_mirror.sh +++ b/scripts/05_mirror.sh @@ -53,15 +53,17 @@ curl -Ls https://mirror.openshift.com/pub/openshift-v4/clients/ocp-dev-preview/{ OCP_RELEASE=$(grep 'Name:' /tmp/release.txt | awk -F ' ' '{print $2}')-x86_64 {% endif %} -{% if version == 'ci' %} -{% set namespace = 'ocp/release' %} +{% if okd %} +PREFIX=origin/release-scos {% elif version == 'candidate' %} -{% set namespace = 'openshift/release-images' %} +PREFIX=openshift/release-images +{% elif version == 'ci' %} +PREFFIX=ocp/ocp-release {% else %} -{% set namespace = 'openshift-release-dev/ocp-release' %} +PREFIX=openshift-release-dev/ocp-release {% endif %} -NAMESPACE={{ namespace }} -echo $REGISTRY:$REGISTRY_PORT/$NAMESPACE:$OCP_RELEASE > /root/version.txt + +echo $REGISTRY:$REGISTRY_PORT/$PREFIX:$OCP_RELEASE > /root/version.txt REGISTRY_USER={{ disconnected_user }} REGISTRY_PASSWORD={{ disconnected_password }}