From adf15ca057f2a0e029d95fae6f70f694dbfae1ff Mon Sep 17 00:00:00 2001 From: Alejandro Gullon Date: Thu, 18 Jun 2026 13:08:03 +0200 Subject: [PATCH] fix: support RHEL 10 bootc images in published-images scenarios Add rhel_version parameter to get_lrel_release_image_url() so el10 scenarios resolve microshift-bootc-rhel10 instead of rhel9. Enable el102-lrel@published-images-standard1 scenario. USHIFT-6785 Co-Authored-By: Claude Opus 4.6 pre-commit.check-secrets: ENABLED --- test/bin/scenario.sh | 5 +++-- ....sh.disabled => el102-lrel@published-images-standard1.sh} | 2 +- .../el10/releases/el102-lrel@published-images-standard2.sh | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) rename test/scenarios-bootc/el10/releases/{el102-lrel@published-images-standard1.sh.disabled => el102-lrel@published-images-standard1.sh} (97%) diff --git a/test/bin/scenario.sh b/test/bin/scenario.sh index 0d1c0885a1..0303d542aa 100755 --- a/test/bin/scenario.sh +++ b/test/bin/scenario.sh @@ -387,6 +387,7 @@ collect_pcp_reports() { get_lrel_release_image_url() { local -r brew_lrel_release_version="$1" + local -r rhel_version="${2:-9}" local image_url="" # Strip the rpm release suffix and convert tilde to dash. @@ -407,7 +408,7 @@ get_lrel_release_image_url() { if [ -n "${mirror_path}" ]; then if ! image_url="$(curl -fsS --retry 3 \ - "https://mirror.openshift.com/pub/openshift-v4/${UNAME_M}/microshift/${mirror_path}/${release_version}/el9/bootc-pullspec.txt")"; then + "https://mirror.openshift.com/pub/openshift-v4/${UNAME_M}/microshift/${mirror_path}/${release_version}/el${rhel_version}/bootc-pullspec.txt")"; then image_url="" fi echo "${image_url}" @@ -423,7 +424,7 @@ get_lrel_release_image_url() { fi # Resolve the arch-specific digest from both registries - local -r image_path="openshift4/microshift-bootc-rhel9" + local -r image_path="openshift4/microshift-bootc-rhel${rhel_version}" local -r image_tag="v${release_version}" local -r prod_registry="registry.redhat.io" local -r stage_registry="registry.stage.redhat.io" diff --git a/test/scenarios-bootc/el10/releases/el102-lrel@published-images-standard1.sh.disabled b/test/scenarios-bootc/el10/releases/el102-lrel@published-images-standard1.sh similarity index 97% rename from test/scenarios-bootc/el10/releases/el102-lrel@published-images-standard1.sh.disabled rename to test/scenarios-bootc/el10/releases/el102-lrel@published-images-standard1.sh index 138d5e8452..18648c38d1 100644 --- a/test/scenarios-bootc/el10/releases/el102-lrel@published-images-standard1.sh.disabled +++ b/test/scenarios-bootc/el10/releases/el102-lrel@published-images-standard1.sh @@ -7,7 +7,7 @@ # shellcheck disable=SC2034 # used elsewhere IMAGE_SIGSTORE_ENABLED=true -LATEST_RELEASE_IMAGE_URL="$(get_lrel_release_image_url "${BREW_LREL_RELEASE_VERSION}")" +LATEST_RELEASE_IMAGE_URL="$(get_lrel_release_image_url "${BREW_LREL_RELEASE_VERSION}" 10)" scenario_create_vms() { exit_if_image_not_set "${LATEST_RELEASE_IMAGE_URL}" diff --git a/test/scenarios-bootc/el10/releases/el102-lrel@published-images-standard2.sh b/test/scenarios-bootc/el10/releases/el102-lrel@published-images-standard2.sh index 00667c9bc0..d41a5009a1 100644 --- a/test/scenarios-bootc/el10/releases/el102-lrel@published-images-standard2.sh +++ b/test/scenarios-bootc/el10/releases/el102-lrel@published-images-standard2.sh @@ -7,7 +7,7 @@ # shellcheck disable=SC2034 # used elsewhere IMAGE_SIGSTORE_ENABLED=true -LATEST_RELEASE_IMAGE_URL="$(get_lrel_release_image_url "${BREW_LREL_RELEASE_VERSION}")" +LATEST_RELEASE_IMAGE_URL="$(get_lrel_release_image_url "${BREW_LREL_RELEASE_VERSION}" 10)" scenario_create_vms() { exit_if_image_not_set "${LATEST_RELEASE_IMAGE_URL}"