From b821d740c139db67f8e3ed228d8ee4b53fbdfb34 Mon Sep 17 00:00:00 2001 From: Alejandro Gullon Date: Tue, 16 Jun 2026 10:55:55 +0200 Subject: [PATCH 1/3] Release testing for 4.22.1 pre-commit.check-secrets: ENABLED From 698541c0c9cc999dc510117c1e6b856e7cf06478 Mon Sep 17 00:00:00 2001 From: Alejandro Gullon Date: Tue, 16 Jun 2026 14:47:52 +0200 Subject: [PATCH 2/3] fix: add GPG keys to composer package sources osbuild-composer 165 (RHEL 9.8) requires explicit gpgkeys in source definitions when check_gpg is enabled. Without them, manifest serialization fails for packages like conmon. Co-Authored-By: Claude Opus 4.6 pre-commit.check-secrets: ENABLED --- test/package-sources/fast-datapath-rhel9.toml | 1 + test/package-sources/rhocp-y.toml | 1 + test/package-sources/rhocp-y1.toml | 1 + test/package-sources/rhocp-y2.toml | 1 + 4 files changed, 4 insertions(+) diff --git a/test/package-sources/fast-datapath-rhel9.toml b/test/package-sources/fast-datapath-rhel9.toml index 07db67ddf0..a913e22009 100644 --- a/test/package-sources/fast-datapath-rhel9.toml +++ b/test/package-sources/fast-datapath-rhel9.toml @@ -4,5 +4,6 @@ type = "yum-baseurl" url = "https://cdn.redhat.com/content/dist/layered/rhel9/{{ .Env.UNAME_M }}/fast-datapath/os" check_gpg = true check_ssl = true +gpgkeys = ["file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release"] system = false rhsm = true diff --git a/test/package-sources/rhocp-y.toml b/test/package-sources/rhocp-y.toml index 8fb8a5ac26..62af8c8083 100644 --- a/test/package-sources/rhocp-y.toml +++ b/test/package-sources/rhocp-y.toml @@ -5,6 +5,7 @@ type = "yum-baseurl" url = "https://cdn.redhat.com/content/dist/layered/rhel9/{{ .Env.UNAME_M }}/rhocp/4.{{ .Env.RHOCP_MINOR_Y }}/os" check_gpg = true check_ssl = true +gpgkeys = ["file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release"] system = false rhsm = true {{- else if env.Getenv "RHOCP_MINOR_Y_BETA" "" -}} diff --git a/test/package-sources/rhocp-y1.toml b/test/package-sources/rhocp-y1.toml index 542c2cebca..ce3f6af85b 100644 --- a/test/package-sources/rhocp-y1.toml +++ b/test/package-sources/rhocp-y1.toml @@ -5,6 +5,7 @@ type = "yum-baseurl" url = "https://cdn.redhat.com/content/dist/layered/rhel9/{{ .Env.UNAME_M }}/rhocp/4.{{ .Env.RHOCP_MINOR_Y1 }}/os" check_gpg = true check_ssl = true +gpgkeys = ["file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release"] system = false rhsm = true {{- else if env.Getenv "RHOCP_MINOR_Y1_BETA" "" -}} diff --git a/test/package-sources/rhocp-y2.toml b/test/package-sources/rhocp-y2.toml index d4689d19e4..12288fb4af 100644 --- a/test/package-sources/rhocp-y2.toml +++ b/test/package-sources/rhocp-y2.toml @@ -5,6 +5,7 @@ type = "yum-baseurl" url = "https://cdn.redhat.com/content/dist/layered/rhel9/{{ .Env.UNAME_M }}/rhocp/4.{{ .Env.RHOCP_MINOR_Y2 }}/os" check_gpg = true check_ssl = true +gpgkeys = ["file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release"] system = false rhsm = true {{- end -}} From 15696b31c495f18770685bd74d96820cc400ca95 Mon Sep 17 00:00:00 2001 From: Alejandro Gullon Date: Tue, 16 Jun 2026 19:27:55 +0200 Subject: [PATCH 3/3] 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. 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 d1c79f5430..a335db3ac7 100755 --- a/test/bin/scenario.sh +++ b/test/bin/scenario.sh @@ -307,6 +307,7 @@ sos_report_for_vm_offline() { 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. @@ -327,7 +328,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}" @@ -343,7 +344,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}"