From 377447a7f968cd2e5e43d7d8e70e200d2a4b2a3b Mon Sep 17 00:00:00 2001 From: Alejandro Gullon Date: Tue, 9 Dec 2025 16:45:34 +0100 Subject: [PATCH 1/3] add support to download RPMs pointing to any X.Y.Z version --- .../openshift-microshift-infra-iso-build-commands.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh b/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh index d2d5656bda778..30c794151a001 100644 --- a/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh +++ b/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh @@ -70,10 +70,11 @@ download_brew_rpms() { # Download the latest RPMs from brew: latest release (ec, rc or zstream), nightly, Y-1 zstream and Y-2 zstream y_version="$(cut -d'.' -f2 "${src_path}/Makefile.version.$(uname -m).var")" - bash -x ./test/bin/manage_brew_rpms.sh download "4.${y_version}" "${out_path}" "${LATEST_RELEASE_TYPE}" || echo "WARNING: Failed to download ${LATEST_RELEASE_TYPE} RPMs for 4.${y_version}" - bash -x ./test/bin/manage_brew_rpms.sh download "4.${y_version}" "${out_path}" "nightly" || echo "WARNING: Failed to download nightly RPMs for 4.${y_version}" - bash -x ./test/bin/manage_brew_rpms.sh download "4.$((${y_version} - 1))" "${out_path}" "zstream" || echo "WARNING: Failed to download zstream RPMs for 4.$((${y_version} - 1))" - bash -x ./test/bin/manage_brew_rpms.sh download "4.$((${y_version} - 2))" "${out_path}" "zstream" || ( echo "WARNING: Failed to download zstream RPMs for 4.$((${y_version} - 2))" && return 1 ) + bash -x ./test/bin/manage_brew_rpms.sh download "4.${y_version}" "${out_path}" "${LATEST_RELEASE_TYPE}" "0" "0" || echo "WARNING: Failed to download ${LATEST_RELEASE_TYPE} RPMs for 4.${y_version}" + bash -x ./test/bin/manage_brew_rpms.sh download "4.${y_version}" "${out_path}" "nightly" "0" "0" || echo "WARNING: Failed to download nightly RPMs for 4.${y_version}" + bash -x ./test/bin/manage_brew_rpms.sh download "4.${y_version}" "${out_path}" "zstream" "1" "0" || echo "WARNING: Failed to download zstream RPMs for 4.${y_version} Y-1" + bash -x ./test/bin/manage_brew_rpms.sh download "4.${y_version}" "${out_path}" "zstream" "2" "0" || ( echo "WARNING: Failed to download zstream RPMs for 4.${y_version} Y-2" && return 1 ) + bash -x ./test/bin/manage_brew_rpms.sh download "4.${y_version}" "${out_path}" "zstream" "0" "1" || echo "WARNING: Failed to download zstream RPMs for 4.${y_version} Z-1" popd &>/dev/null return 0 From 407259c0abf860adfcdca02cfee5baa4d11edfc5 Mon Sep 17 00:00:00 2001 From: Alejandro Gullon Date: Mon, 15 Dec 2025 09:45:36 +0100 Subject: [PATCH 2/3] use dafault versions --- .../openshift-microshift-infra-iso-build-commands.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh b/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh index 30c794151a001..37158f339c986 100644 --- a/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh +++ b/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh @@ -70,8 +70,8 @@ download_brew_rpms() { # Download the latest RPMs from brew: latest release (ec, rc or zstream), nightly, Y-1 zstream and Y-2 zstream y_version="$(cut -d'.' -f2 "${src_path}/Makefile.version.$(uname -m).var")" - bash -x ./test/bin/manage_brew_rpms.sh download "4.${y_version}" "${out_path}" "${LATEST_RELEASE_TYPE}" "0" "0" || echo "WARNING: Failed to download ${LATEST_RELEASE_TYPE} RPMs for 4.${y_version}" - bash -x ./test/bin/manage_brew_rpms.sh download "4.${y_version}" "${out_path}" "nightly" "0" "0" || echo "WARNING: Failed to download nightly RPMs for 4.${y_version}" + bash -x ./test/bin/manage_brew_rpms.sh download "4.${y_version}" "${out_path}" "${LATEST_RELEASE_TYPE}" || echo "WARNING: Failed to download ${LATEST_RELEASE_TYPE} RPMs for 4.${y_version}" + bash -x ./test/bin/manage_brew_rpms.sh download "4.${y_version}" "${out_path}" "nightly" || echo "WARNING: Failed to download nightly RPMs for 4.${y_version}" bash -x ./test/bin/manage_brew_rpms.sh download "4.${y_version}" "${out_path}" "zstream" "1" "0" || echo "WARNING: Failed to download zstream RPMs for 4.${y_version} Y-1" bash -x ./test/bin/manage_brew_rpms.sh download "4.${y_version}" "${out_path}" "zstream" "2" "0" || ( echo "WARNING: Failed to download zstream RPMs for 4.${y_version} Y-2" && return 1 ) bash -x ./test/bin/manage_brew_rpms.sh download "4.${y_version}" "${out_path}" "zstream" "0" "1" || echo "WARNING: Failed to download zstream RPMs for 4.${y_version} Z-1" From fe5af08a4e12a7eb3f96da710d40b1c411e9680d Mon Sep 17 00:00:00 2001 From: Alejandro Gullon Date: Mon, 15 Dec 2025 09:57:28 +0100 Subject: [PATCH 3/3] only add previous Y and Z version for Z-1 --- .../openshift-microshift-infra-iso-build-commands.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh b/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh index 37158f339c986..2248a2d6e4309 100644 --- a/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh +++ b/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh @@ -72,8 +72,8 @@ download_brew_rpms() { y_version="$(cut -d'.' -f2 "${src_path}/Makefile.version.$(uname -m).var")" bash -x ./test/bin/manage_brew_rpms.sh download "4.${y_version}" "${out_path}" "${LATEST_RELEASE_TYPE}" || echo "WARNING: Failed to download ${LATEST_RELEASE_TYPE} RPMs for 4.${y_version}" bash -x ./test/bin/manage_brew_rpms.sh download "4.${y_version}" "${out_path}" "nightly" || echo "WARNING: Failed to download nightly RPMs for 4.${y_version}" - bash -x ./test/bin/manage_brew_rpms.sh download "4.${y_version}" "${out_path}" "zstream" "1" "0" || echo "WARNING: Failed to download zstream RPMs for 4.${y_version} Y-1" - bash -x ./test/bin/manage_brew_rpms.sh download "4.${y_version}" "${out_path}" "zstream" "2" "0" || ( echo "WARNING: Failed to download zstream RPMs for 4.${y_version} Y-2" && return 1 ) + bash -x ./test/bin/manage_brew_rpms.sh download "4.$((${y_version} - 1))" "${out_path}" "zstream" || echo "WARNING: Failed to download zstream RPMs for 4.$((${y_version} - 1))" + bash -x ./test/bin/manage_brew_rpms.sh download "4.$((${y_version} - 2))" "${out_path}" "zstream" || ( echo "WARNING: Failed to download zstream RPMs for 4.$((${y_version} - 2))" && return 1 ) bash -x ./test/bin/manage_brew_rpms.sh download "4.${y_version}" "${out_path}" "zstream" "0" "1" || echo "WARNING: Failed to download zstream RPMs for 4.${y_version} Z-1" popd &>/dev/null