Get oc mirror from candidate clients

Signed-off-by: Simone Tiraboschi <stirabos@redhat.com>
openshift · Feb 12, 2024 · e0cfccd · e0cfccd
1 parent b1776d1
commit e0cfccd
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 22 deletions.
diff --git a/...rshift/kubevirt/install/disconnected/hypershift-kubevirt-install-disconnected-commands.sh b/...rshift/kubevirt/install/disconnected/hypershift-kubevirt-install-disconnected-commands.sh
@@ -69,22 +69,19 @@ CNV_CHANNEL="nightly-\${CNV_PRERELEASE_VERSION}"
 echo "3: skopeo copy docker://\${CNV_PRERELEASE_CATALOG_IMAGE} oci:///home/cnv-local-catalog --remove-signatures"
 skopeo copy "docker://\${CNV_PRERELEASE_CATALOG_IMAGE}" "oci:///home/cnv-local-catalog" --remove-signatures
 
-echo "4: extract oc-mirror from image oc-mirror:v4.14.1"
-if [[! -f /home/oc-mirror ]]; then
-    set +x
-    QUAY_USER=\$(cat "/home/registry_quay.json" | jq -r '.user')
-    QUAY_PASSWORD=\$(cat "/home/registry_quay.json" | jq -r '.password')
-    skopeo login quay.io -u "\${QUAY_USER}" -p "\${QUAY_PASSWORD}"
-    set -x
-    oc_mirror_image="quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:80acc20087bec702fcb2624345f3dda071cd78092e5d3c972d75615b837549de"
-    oc image extract \$oc_mirror_image --path /usr/bin/oc-mirror:/home --confirm
+echo "4: get oc-mirror from candidate clients"
+if [[ ! -f /home/oc-mirror ]]; then
+    MIRROR2URL="https://mirror2.openshift.com/pub/openshift-v4"
+    CLIENTURL="\${MIRROR2URL}"/x86_64/clients/ocp/candidate
+    curl -s -k -L "\${CLIENTURL}/oc-mirror.tar.gz" -o om.tar.gz && tar -C /home -xzvf om.tar.gz && rm -f om.tar.gz
     if ls /home/oc-mirror > /dev/null ; then
         chmod +x /home/oc-mirror
     else
         echo "Warning, can not find oc-mirror abort !!!"
         exit 1
     fi
 fi
+/home/oc-mirror version
 
 echo "5: oc-mirror --config /home/imageset-config.yaml docker://\${mirror_registry} --oci-registries-config=/home/registry.conf --continue-on-error --skip-missing"
 catalog_image="openshift-cnv/nightly-catalog" # TODO: handle stable when needed

diff --git a/...istry/hypershift/mce/install/disconnected/hypershift-mce-install-disconnected-commands.sh b/...istry/hypershift/mce/install/disconnected/hypershift-mce-install-disconnected-commands.sh
@@ -48,20 +48,19 @@ MCE_INDEX_IMAGE=\$(cat /home/mce-index-image)
 echo "3: skopeo copy docker://\${MCE_INDEX_IMAGE} oci:///home/mce-local-catalog --remove-signatures"
 skopeo copy "docker://\${MCE_INDEX_IMAGE}" "oci:///home/mce-local-catalog" --remove-signatures
 
-echo "4. extract oc-mirror from image oc-mirror:v4.14.1"
-set +x
-QUAY_USER=\$(cat "/home/registry_quay.json" | jq -r '.user')
-QUAY_PASSWORD=\$(cat "/home/registry_quay.json" | jq -r '.password')
-skopeo login quay.io -u "\${QUAY_USER}" -p "\${QUAY_PASSWORD}"
-set -x
-oc_mirror_image="quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:80acc20087bec702fcb2624345f3dda071cd78092e5d3c972d75615b837549de"
-oc image extract \$oc_mirror_image --path /usr/bin/oc-mirror:/home --confirm
-if ls /home/oc-mirror >/dev/null ;then
-    chmod +x /home/oc-mirror
-else
-    echo "Warning, can not find oc-mirror abort !!!"
-    exit 1
+echo "4: get oc-mirror from candidate clients"
+if [[ ! -f /home/oc-mirror ]]; then
+    MIRROR2URL="https://mirror2.openshift.com/pub/openshift-v4"
+    CLIENTURL="\${MIRROR2URL}"/x86_64/clients/ocp/candidate
+    curl -s -k -L "\${CLIENTURL}/oc-mirror.tar.gz" -o om.tar.gz && tar -C /home -xzvf om.tar.gz && rm -f om.tar.gz
+    if ls /home/oc-mirror > /dev/null ; then
+        chmod +x /home/oc-mirror
+    else
+        echo "Warning, can not find oc-mirror abort !!!"
+        exit 1
+    fi
 fi
+/home/oc-mirror version
 
 echo "5. oc-mirror --config /home/imageset-config.yaml docker://\${mirror_registry} --oci-registries-config=/home/registry.conf --continue-on-error --skip-missing"
 catalog_image="acm-d/mce-custom-registry"