From 18098e9cfca152b2982e211bb0a336a8ebd32b90 Mon Sep 17 00:00:00 2001 From: Gregory Giguashvili Date: Mon, 23 Feb 2026 14:10:22 +0200 Subject: [PATCH 1/8] Update layer1-base images --- ...d.containerfile => rhel98-bootc-crel-isolated.containerfile} | 2 +- ....containerfile => rhel98-bootc-crel-optionals.containerfile} | 2 +- ...bootc-crel.containerfile => rhel98-bootc-crel.containerfile} | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename test/image-blueprints-bootc/layer1-base/group2/{rhel96-bootc-crel-isolated.containerfile => rhel98-bootc-crel-isolated.containerfile} (98%) rename test/image-blueprints-bootc/layer1-base/group2/{rhel96-bootc-crel-optionals.containerfile => rhel98-bootc-crel-optionals.containerfile} (97%) rename test/image-blueprints-bootc/layer1-base/group2/{rhel96-bootc-crel.containerfile => rhel98-bootc-crel.containerfile} (97%) diff --git a/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-crel-isolated.containerfile b/test/image-blueprints-bootc/layer1-base/group2/rhel98-bootc-crel-isolated.containerfile similarity index 98% rename from test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-crel-isolated.containerfile rename to test/image-blueprints-bootc/layer1-base/group2/rhel98-bootc-crel-isolated.containerfile index 3ce934f942..0622cb201d 100644 --- a/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-crel-isolated.containerfile +++ b/test/image-blueprints-bootc/layer1-base/group2/rhel98-bootc-crel-isolated.containerfile @@ -1,6 +1,6 @@ # {{- if env.Getenv "CURRENT_RELEASE_VERSION" "" -}} # Note: This comment makes templating add a new line before the code -FROM localhost/rhel96-test-agent:latest +FROM localhost/rhel98-test-agent:latest # Copy repository configuration COPY ./bootc-images/microshift-fast-datapath-rhel9.repo ./bootc-images/microshift-crel.repo ./bootc-images/microshift-rhocp-y.repo \ diff --git a/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-crel-optionals.containerfile b/test/image-blueprints-bootc/layer1-base/group2/rhel98-bootc-crel-optionals.containerfile similarity index 97% rename from test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-crel-optionals.containerfile rename to test/image-blueprints-bootc/layer1-base/group2/rhel98-bootc-crel-optionals.containerfile index f90eb9a7c7..8c89c6af96 100644 --- a/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-crel-optionals.containerfile +++ b/test/image-blueprints-bootc/layer1-base/group2/rhel98-bootc-crel-optionals.containerfile @@ -1,6 +1,6 @@ # {{- if env.Getenv "CURRENT_RELEASE_VERSION" "" -}} # Note: This comment makes templating add a new line before the code -FROM localhost/rhel96-test-agent:latest +FROM localhost/rhel98-test-agent:latest # Copy repository configuration COPY ./bootc-images/microshift-fast-datapath-rhel9.repo ./bootc-images/microshift-crel.repo ./bootc-images/microshift-rhocp-y.repo \ diff --git a/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-crel.containerfile b/test/image-blueprints-bootc/layer1-base/group2/rhel98-bootc-crel.containerfile similarity index 97% rename from test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-crel.containerfile rename to test/image-blueprints-bootc/layer1-base/group2/rhel98-bootc-crel.containerfile index b898187453..934f50e14c 100644 --- a/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-crel.containerfile +++ b/test/image-blueprints-bootc/layer1-base/group2/rhel98-bootc-crel.containerfile @@ -1,6 +1,6 @@ # {{- if env.Getenv "CURRENT_RELEASE_VERSION" "" -}} # Note: This comment makes templating add a new line before the code -FROM localhost/rhel96-test-agent:latest +FROM localhost/rhel98-test-agent:latest # Copy repository configuration COPY ./bootc-images/microshift-fast-datapath-rhel9.repo ./bootc-images/microshift-crel.repo ./bootc-images/microshift-rhocp-y.repo \ From 221013add2c8749282f147f46d4b032b7bce130a Mon Sep 17 00:00:00 2001 From: Gregory Giguashvili Date: Mon, 23 Feb 2026 14:10:48 +0200 Subject: [PATCH 2/8] Update layer2-presubmit images --- ...ase.containerfile => rhel98-bootc-source-base.containerfile} | 2 +- ...c-source.containerfile => rhel98-bootc-source.containerfile} | 2 +- ...-aux.containerfile => rhel98-bootc-source-aux.containerfile} | 2 +- ...erfile => rhel98-bootc-source-fake-next-minor.containerfile} | 2 +- ...ips.containerfile => rhel98-bootc-source-fips.containerfile} | 2 +- ...ontainerfile => rhel98-bootc-source-optionals.containerfile} | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename test/image-blueprints-bootc/layer2-presubmit/group1/{rhel96-bootc-source-base.containerfile => rhel98-bootc-source-base.containerfile} (97%) rename test/image-blueprints-bootc/layer2-presubmit/group1/{rhel96-bootc-source.containerfile => rhel98-bootc-source.containerfile} (97%) rename test/image-blueprints-bootc/layer2-presubmit/group2/{rhel96-bootc-source-aux.containerfile => rhel98-bootc-source-aux.containerfile} (63%) rename test/image-blueprints-bootc/layer2-presubmit/group2/{rhel96-bootc-source-fake-next-minor.containerfile => rhel98-bootc-source-fake-next-minor.containerfile} (94%) rename test/image-blueprints-bootc/layer2-presubmit/group2/{rhel96-bootc-source-fips.containerfile => rhel98-bootc-source-fips.containerfile} (92%) rename test/image-blueprints-bootc/layer2-presubmit/group2/{rhel96-bootc-source-optionals.containerfile => rhel98-bootc-source-optionals.containerfile} (96%) diff --git a/test/image-blueprints-bootc/layer2-presubmit/group1/rhel96-bootc-source-base.containerfile b/test/image-blueprints-bootc/layer2-presubmit/group1/rhel98-bootc-source-base.containerfile similarity index 97% rename from test/image-blueprints-bootc/layer2-presubmit/group1/rhel96-bootc-source-base.containerfile rename to test/image-blueprints-bootc/layer2-presubmit/group1/rhel98-bootc-source-base.containerfile index 038a78a79b..fcb7f2d222 100644 --- a/test/image-blueprints-bootc/layer2-presubmit/group1/rhel96-bootc-source-base.containerfile +++ b/test/image-blueprints-bootc/layer2-presubmit/group1/rhel98-bootc-source-base.containerfile @@ -1,4 +1,4 @@ -FROM localhost/rhel96-test-agent:latest +FROM localhost/rhel98-test-agent:latest # Build arguments ARG USHIFT_RPM_REPO_NAME=microshift-base diff --git a/test/image-blueprints-bootc/layer2-presubmit/group1/rhel96-bootc-source.containerfile b/test/image-blueprints-bootc/layer2-presubmit/group1/rhel98-bootc-source.containerfile similarity index 97% rename from test/image-blueprints-bootc/layer2-presubmit/group1/rhel96-bootc-source.containerfile rename to test/image-blueprints-bootc/layer2-presubmit/group1/rhel98-bootc-source.containerfile index f104ec981e..8acefeeeaf 100644 --- a/test/image-blueprints-bootc/layer2-presubmit/group1/rhel96-bootc-source.containerfile +++ b/test/image-blueprints-bootc/layer2-presubmit/group1/rhel98-bootc-source.containerfile @@ -1,4 +1,4 @@ -FROM localhost/rhel96-test-agent:latest +FROM localhost/rhel98-test-agent:latest # Build arguments ARG USHIFT_RPM_REPO_NAME=microshift-local diff --git a/test/image-blueprints-bootc/layer2-presubmit/group2/rhel96-bootc-source-aux.containerfile b/test/image-blueprints-bootc/layer2-presubmit/group2/rhel98-bootc-source-aux.containerfile similarity index 63% rename from test/image-blueprints-bootc/layer2-presubmit/group2/rhel96-bootc-source-aux.containerfile rename to test/image-blueprints-bootc/layer2-presubmit/group2/rhel98-bootc-source-aux.containerfile index c4948af360..2cf15ada5f 100644 --- a/test/image-blueprints-bootc/layer2-presubmit/group2/rhel96-bootc-source-aux.containerfile +++ b/test/image-blueprints-bootc/layer2-presubmit/group2/rhel98-bootc-source-aux.containerfile @@ -1,2 +1,2 @@ -FROM localhost/rhel96-bootc-source:latest +FROM localhost/rhel98-bootc-source:latest # Create another label for the source container image without any changes diff --git a/test/image-blueprints-bootc/layer2-presubmit/group2/rhel96-bootc-source-fake-next-minor.containerfile b/test/image-blueprints-bootc/layer2-presubmit/group2/rhel98-bootc-source-fake-next-minor.containerfile similarity index 94% rename from test/image-blueprints-bootc/layer2-presubmit/group2/rhel96-bootc-source-fake-next-minor.containerfile rename to test/image-blueprints-bootc/layer2-presubmit/group2/rhel98-bootc-source-fake-next-minor.containerfile index 5050221de1..f99b143c26 100644 --- a/test/image-blueprints-bootc/layer2-presubmit/group2/rhel96-bootc-source-fake-next-minor.containerfile +++ b/test/image-blueprints-bootc/layer2-presubmit/group2/rhel98-bootc-source-fake-next-minor.containerfile @@ -1,4 +1,4 @@ -FROM localhost/rhel96-bootc-source:latest +FROM localhost/rhel98-bootc-source:latest # Build arguments ARG USHIFT_RPM_REPO_NAME=microshift-fake-next-minor diff --git a/test/image-blueprints-bootc/layer2-presubmit/group2/rhel96-bootc-source-fips.containerfile b/test/image-blueprints-bootc/layer2-presubmit/group2/rhel98-bootc-source-fips.containerfile similarity index 92% rename from test/image-blueprints-bootc/layer2-presubmit/group2/rhel96-bootc-source-fips.containerfile rename to test/image-blueprints-bootc/layer2-presubmit/group2/rhel98-bootc-source-fips.containerfile index ff3ff731f6..64062111bd 100644 --- a/test/image-blueprints-bootc/layer2-presubmit/group2/rhel96-bootc-source-fips.containerfile +++ b/test/image-blueprints-bootc/layer2-presubmit/group2/rhel98-bootc-source-fips.containerfile @@ -1,4 +1,4 @@ -FROM localhost/rhel96-bootc-source:latest +FROM localhost/rhel98-bootc-source:latest # Add fips=1 kernel argument # See https://containers.github.io/bootc/building/kernel-arguments.html diff --git a/test/image-blueprints-bootc/layer2-presubmit/group2/rhel96-bootc-source-optionals.containerfile b/test/image-blueprints-bootc/layer2-presubmit/group2/rhel98-bootc-source-optionals.containerfile similarity index 96% rename from test/image-blueprints-bootc/layer2-presubmit/group2/rhel96-bootc-source-optionals.containerfile rename to test/image-blueprints-bootc/layer2-presubmit/group2/rhel98-bootc-source-optionals.containerfile index 90ec9e9d91..b7f1866590 100644 --- a/test/image-blueprints-bootc/layer2-presubmit/group2/rhel96-bootc-source-optionals.containerfile +++ b/test/image-blueprints-bootc/layer2-presubmit/group2/rhel98-bootc-source-optionals.containerfile @@ -1,4 +1,4 @@ -FROM localhost/rhel96-bootc-source:latest +FROM localhost/rhel98-bootc-source:latest # Build arguments ARG USHIFT_RPM_REPO_NAME=microshift-local From 1c4c55d3e0ce993f1c9eb915e582b33534fce4e7 Mon Sep 17 00:00:00 2001 From: Gregory Giguashvili Date: Mon, 23 Feb 2026 14:11:08 +0200 Subject: [PATCH 3/8] Update layer3-periodic images --- ...rfile => rhel98-bootc-source-ai-model-serving.containerfile} | 2 +- ...containerfile => rhel98-bootc-source-isolated.containerfile} | 2 +- .../group2/rhel96-bootc-source-isolated.image-bootc | 1 - ...e-bootc => rhel98-bootc-source-ai-model-serving.image-bootc} | 2 +- ...s.containerfile => rhel98-bootc-source-gitops.containerfile} | 2 +- .../group2/rhel98-bootc-source-isolated.image-bootc | 1 + 6 files changed, 5 insertions(+), 5 deletions(-) rename test/image-blueprints-bootc/layer3-periodic/group1/{rhel96-bootc-source-ai-model-serving.containerfile => rhel98-bootc-source-ai-model-serving.containerfile} (99%) rename test/image-blueprints-bootc/layer3-periodic/group1/{rhel96-bootc-source-isolated.containerfile => rhel98-bootc-source-isolated.containerfile} (97%) delete mode 100644 test/image-blueprints-bootc/layer3-periodic/group2/rhel96-bootc-source-isolated.image-bootc rename test/image-blueprints-bootc/layer3-periodic/group2/{rhel96-bootc-source-ai-model-serving.image-bootc => rhel98-bootc-source-ai-model-serving.image-bootc} (59%) rename test/image-blueprints-bootc/layer3-periodic/group2/{rhel96-bootc-source-gitops.containerfile => rhel98-bootc-source-gitops.containerfile} (87%) create mode 100644 test/image-blueprints-bootc/layer3-periodic/group2/rhel98-bootc-source-isolated.image-bootc diff --git a/test/image-blueprints-bootc/layer3-periodic/group1/rhel96-bootc-source-ai-model-serving.containerfile b/test/image-blueprints-bootc/layer3-periodic/group1/rhel98-bootc-source-ai-model-serving.containerfile similarity index 99% rename from test/image-blueprints-bootc/layer3-periodic/group1/rhel96-bootc-source-ai-model-serving.containerfile rename to test/image-blueprints-bootc/layer3-periodic/group1/rhel98-bootc-source-ai-model-serving.containerfile index 23246b51c0..1656773621 100644 --- a/test/image-blueprints-bootc/layer3-periodic/group1/rhel96-bootc-source-ai-model-serving.containerfile +++ b/test/image-blueprints-bootc/layer3-periodic/group1/rhel98-bootc-source-ai-model-serving.containerfile @@ -1,6 +1,6 @@ # {{- if and (env.Getenv "UNAME_M" "") (eq "x86_64" .Env.UNAME_M) }} # Currently, RHOAI is only available for x86_64 -FROM localhost/rhel96-bootc-source:latest +FROM localhost/rhel98-bootc-source:latest # Build arguments ARG USHIFT_RPM_REPO_NAME=microshift-local diff --git a/test/image-blueprints-bootc/layer3-periodic/group1/rhel96-bootc-source-isolated.containerfile b/test/image-blueprints-bootc/layer3-periodic/group1/rhel98-bootc-source-isolated.containerfile similarity index 97% rename from test/image-blueprints-bootc/layer3-periodic/group1/rhel96-bootc-source-isolated.containerfile rename to test/image-blueprints-bootc/layer3-periodic/group1/rhel98-bootc-source-isolated.containerfile index 5bab7a3298..f3f37b3468 100644 --- a/test/image-blueprints-bootc/layer3-periodic/group1/rhel96-bootc-source-isolated.containerfile +++ b/test/image-blueprints-bootc/layer3-periodic/group1/rhel98-bootc-source-isolated.containerfile @@ -1,4 +1,4 @@ -FROM localhost/rhel96-bootc-source:latest +FROM localhost/rhel98-bootc-source:latest # The qemu-guest-agent is used in offline tests RUN dnf install -y qemu-guest-agent && \ diff --git a/test/image-blueprints-bootc/layer3-periodic/group2/rhel96-bootc-source-isolated.image-bootc b/test/image-blueprints-bootc/layer3-periodic/group2/rhel96-bootc-source-isolated.image-bootc deleted file mode 100644 index 504117eba5..0000000000 --- a/test/image-blueprints-bootc/layer3-periodic/group2/rhel96-bootc-source-isolated.image-bootc +++ /dev/null @@ -1 +0,0 @@ -localhost/rhel96-bootc-source-isolated:latest \ No newline at end of file diff --git a/test/image-blueprints-bootc/layer3-periodic/group2/rhel96-bootc-source-ai-model-serving.image-bootc b/test/image-blueprints-bootc/layer3-periodic/group2/rhel98-bootc-source-ai-model-serving.image-bootc similarity index 59% rename from test/image-blueprints-bootc/layer3-periodic/group2/rhel96-bootc-source-ai-model-serving.image-bootc rename to test/image-blueprints-bootc/layer3-periodic/group2/rhel98-bootc-source-ai-model-serving.image-bootc index f126435541..72707d185e 100644 --- a/test/image-blueprints-bootc/layer3-periodic/group2/rhel96-bootc-source-ai-model-serving.image-bootc +++ b/test/image-blueprints-bootc/layer3-periodic/group2/rhel98-bootc-source-ai-model-serving.image-bootc @@ -1,3 +1,3 @@ {{- if and (env.Getenv "UNAME_M" "") (eq "x86_64" .Env.UNAME_M) }} -localhost/rhel96-bootc-source-ai-model-serving:latest +localhost/rhel98-bootc-source-ai-model-serving:latest {{- end }} diff --git a/test/image-blueprints-bootc/layer3-periodic/group2/rhel96-bootc-source-gitops.containerfile b/test/image-blueprints-bootc/layer3-periodic/group2/rhel98-bootc-source-gitops.containerfile similarity index 87% rename from test/image-blueprints-bootc/layer3-periodic/group2/rhel96-bootc-source-gitops.containerfile rename to test/image-blueprints-bootc/layer3-periodic/group2/rhel98-bootc-source-gitops.containerfile index 7294382846..09503dabfc 100644 --- a/test/image-blueprints-bootc/layer3-periodic/group2/rhel96-bootc-source-gitops.containerfile +++ b/test/image-blueprints-bootc/layer3-periodic/group2/rhel98-bootc-source-gitops.containerfile @@ -1,4 +1,4 @@ -FROM localhost/rhel96-bootc-source:latest +FROM localhost/rhel98-bootc-source:latest # Copy repository configuration COPY ./bootc-images/microshift-gitops.repo \ diff --git a/test/image-blueprints-bootc/layer3-periodic/group2/rhel98-bootc-source-isolated.image-bootc b/test/image-blueprints-bootc/layer3-periodic/group2/rhel98-bootc-source-isolated.image-bootc new file mode 100644 index 0000000000..5ab3fd9e7c --- /dev/null +++ b/test/image-blueprints-bootc/layer3-periodic/group2/rhel98-bootc-source-isolated.image-bootc @@ -0,0 +1 @@ +localhost/rhel98-bootc-source-isolated:latest \ No newline at end of file From 0b1a8c84d04dbb12103695fe855d9573eeb26c16 Mon Sep 17 00:00:00 2001 From: Gregory Giguashvili Date: Mon, 23 Feb 2026 14:11:29 +0200 Subject: [PATCH 4/8] Update presubmit scenarios --- ...rade-ok.sh => el96-prel@el98-src@upgrade-ok.sh} | 2 +- ...rade-ok.sh => el98-base@el98-src@upgrade-ok.sh} | 6 +++--- ...ok.sh => el98-base@src@opt@delta-upgrade-ok.sh} | 14 +++++++------- ...line.sh => el98-src@ai-model-serving-online.sh} | 4 ++-- ...@auto-recovery.sh => el98-src@auto-recovery.sh} | 4 ++-- ...sh => el98-src@backup-and-restore-on-reboot.sh} | 4 ++-- .../{el96-src@backups.sh => el98-src@backups.sh} | 4 ++-- ...@configuration.sh => el98-src@configuration.sh} | 4 ++-- ...ngrade-block.sh => el98-src@downgrade-block.sh} | 6 +++--- ...96-src@dual-stack.sh => el98-src@dual-stack.sh} | 4 ++-- ...rade-ok.sh => el98-src@el100-src@upgrade-ok.sh} | 4 ++-- .../{el96-src@ipv6.sh => el98-src@ipv6.sh} | 4 ++-- ...el96-src@multi-nic.sh => el98-src@multi-nic.sh} | 4 ++-- .../{el96-src@optional.sh => el98-src@optional.sh} | 4 ++-- .../{el96-src@router.sh => el98-src@router.sh} | 4 ++-- ...ndard-suite1.sh => el98-src@standard-suite1.sh} | 6 +++--- ...ndard-suite2.sh => el98-src@standard-suite2.sh} | 4 ++-- .../{el96-src@storage.sh => el98-src@storage.sh} | 4 ++-- ....sh => el98-src@upgrade-fails-then-recovers.sh} | 6 +++--- ...@upgrade-fails.sh => el98-src@upgrade-fails.sh} | 6 +++--- 20 files changed, 49 insertions(+), 49 deletions(-) rename test/scenarios-bootc/presubmits/{el96-prel@el96-src@upgrade-ok.sh => el96-prel@el98-src@upgrade-ok.sh} (91%) rename test/scenarios-bootc/presubmits/{el96-base@el96-src@upgrade-ok.sh => el98-base@el98-src@upgrade-ok.sh} (66%) rename test/scenarios-bootc/presubmits/{el96-base@src@opt@delta-upgrade-ok.sh => el98-base@src@opt@delta-upgrade-ok.sh} (51%) rename test/scenarios-bootc/presubmits/{el96-src@ai-model-serving-online.sh => el98-src@ai-model-serving-online.sh} (89%) rename test/scenarios-bootc/presubmits/{el96-src@auto-recovery.sh => el98-src@auto-recovery.sh} (72%) rename test/scenarios-bootc/presubmits/{el96-src@backup-and-restore-on-reboot.sh => el98-src@backup-and-restore-on-reboot.sh} (69%) rename test/scenarios-bootc/presubmits/{el96-src@backups.sh => el98-src@backups.sh} (68%) rename test/scenarios-bootc/presubmits/{el96-src@configuration.sh => el98-src@configuration.sh} (67%) rename test/scenarios-bootc/presubmits/{el96-src@downgrade-block.sh => el98-src@downgrade-block.sh} (65%) rename test/scenarios-bootc/presubmits/{el96-src@dual-stack.sh => el98-src@dual-stack.sh} (66%) rename test/scenarios-bootc/presubmits/{el96-src@el100-src@upgrade-ok.sh => el98-src@el100-src@upgrade-ok.sh} (77%) rename test/scenarios-bootc/presubmits/{el96-src@ipv6.sh => el98-src@ipv6.sh} (88%) rename test/scenarios-bootc/presubmits/{el96-src@multi-nic.sh => el98-src@multi-nic.sh} (84%) rename test/scenarios-bootc/presubmits/{el96-src@optional.sh => el98-src@optional.sh} (92%) rename test/scenarios-bootc/presubmits/{el96-src@router.sh => el98-src@router.sh} (68%) rename test/scenarios-bootc/presubmits/{el96-src@standard-suite1.sh => el98-src@standard-suite1.sh} (72%) rename test/scenarios-bootc/presubmits/{el96-src@standard-suite2.sh => el98-src@standard-suite2.sh} (67%) rename test/scenarios-bootc/presubmits/{el96-src@storage.sh => el98-src@storage.sh} (67%) rename test/scenarios-bootc/presubmits/{el96-src@upgrade-fails-then-recovers.sh => el98-src@upgrade-fails-then-recovers.sh} (65%) rename test/scenarios-bootc/presubmits/{el96-src@upgrade-fails.sh => el98-src@upgrade-fails.sh} (69%) diff --git a/test/scenarios-bootc/presubmits/el96-prel@el96-src@upgrade-ok.sh b/test/scenarios-bootc/presubmits/el96-prel@el98-src@upgrade-ok.sh similarity index 91% rename from test/scenarios-bootc/presubmits/el96-prel@el96-src@upgrade-ok.sh rename to test/scenarios-bootc/presubmits/el96-prel@el98-src@upgrade-ok.sh index 0dd63d289a..f15e5936d8 100644 --- a/test/scenarios-bootc/presubmits/el96-prel@el96-src@upgrade-ok.sh +++ b/test/scenarios-bootc/presubmits/el96-prel@el98-src@upgrade-ok.sh @@ -21,7 +21,7 @@ scenario_run_tests() { exit_if_image_not_found "${start_image}" run_tests host1 \ - --variable "TARGET_REF:rhel96-bootc-source" \ + --variable "TARGET_REF:rhel98-bootc-source" \ --variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \ suites/upgrade/upgrade-successful.robot } diff --git a/test/scenarios-bootc/presubmits/el96-base@el96-src@upgrade-ok.sh b/test/scenarios-bootc/presubmits/el98-base@el98-src@upgrade-ok.sh similarity index 66% rename from test/scenarios-bootc/presubmits/el96-base@el96-src@upgrade-ok.sh rename to test/scenarios-bootc/presubmits/el98-base@el98-src@upgrade-ok.sh index e0f454f5e8..16ef0efebe 100644 --- a/test/scenarios-bootc/presubmits/el96-base@el96-src@upgrade-ok.sh +++ b/test/scenarios-bootc/presubmits/el98-base@el98-src@upgrade-ok.sh @@ -3,8 +3,8 @@ # Sourced from scenario.sh and uses functions defined there. scenario_create_vms() { - prepare_kickstart host1 kickstart-bootc.ks.template rhel96-bootc-source-base - launch_vm --boot_blueprint rhel96-bootc + prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source-base + launch_vm --boot_blueprint rhel98-bootc } scenario_remove_vms() { @@ -13,7 +13,7 @@ scenario_remove_vms() { scenario_run_tests() { run_tests host1 \ - --variable "TARGET_REF:rhel96-bootc-source" \ + --variable "TARGET_REF:rhel98-bootc-source" \ --variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \ suites/upgrade/upgrade-successful.robot } diff --git a/test/scenarios-bootc/presubmits/el96-base@src@opt@delta-upgrade-ok.sh b/test/scenarios-bootc/presubmits/el98-base@src@opt@delta-upgrade-ok.sh similarity index 51% rename from test/scenarios-bootc/presubmits/el96-base@src@opt@delta-upgrade-ok.sh rename to test/scenarios-bootc/presubmits/el98-base@src@opt@delta-upgrade-ok.sh index 14f9fb1012..b72937efef 100644 --- a/test/scenarios-bootc/presubmits/el96-base@src@opt@delta-upgrade-ok.sh +++ b/test/scenarios-bootc/presubmits/el98-base@src@opt@delta-upgrade-ok.sh @@ -3,8 +3,8 @@ # Sourced from scenario.sh and uses functions defined there. scenario_create_vms() { - prepare_kickstart host1 kickstart-bootc.ks.template rhel96-bootc-source-base - launch_vm --boot_blueprint rhel96-bootc + prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source-base + launch_vm --boot_blueprint rhel98-bootc } scenario_remove_vms() { @@ -12,13 +12,13 @@ scenario_remove_vms() { } scenario_run_tests() { - prepare_static_delta rhel96-bootc-source-base rhel96-bootc-source - apply_static_delta rhel96-bootc-source-base rhel96-bootc-source + prepare_static_delta rhel98-bootc-source-base rhel98-bootc-source + apply_static_delta rhel98-bootc-source-base rhel98-bootc-source - prepare_static_delta rhel96-bootc-source rhel96-bootc-source-optionals - apply_static_delta rhel96-bootc-source rhel96-bootc-source-optionals + prepare_static_delta rhel98-bootc-source rhel98-bootc-source-optionals + apply_static_delta rhel98-bootc-source rhel98-bootc-source-optionals - for ref in rhel96-bootc-source-from-sdelta rhel96-bootc-source-optionals-from-sdelta ; do + for ref in rhel98-bootc-source-from-sdelta rhel98-bootc-source-optionals-from-sdelta ; do run_tests host1 \ --variable "TARGET_REF:${ref}" \ --variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \ diff --git a/test/scenarios-bootc/presubmits/el96-src@ai-model-serving-online.sh b/test/scenarios-bootc/presubmits/el98-src@ai-model-serving-online.sh similarity index 89% rename from test/scenarios-bootc/presubmits/el96-src@ai-model-serving-online.sh rename to test/scenarios-bootc/presubmits/el98-src@ai-model-serving-online.sh index b0e90dd24e..a127f30a4d 100644 --- a/test/scenarios-bootc/presubmits/el96-src@ai-model-serving-online.sh +++ b/test/scenarios-bootc/presubmits/el98-src@ai-model-serving-online.sh @@ -22,8 +22,8 @@ scenario_create_vms() { check_platform true # Increased disk size because of the additional embedded images (especially OVMS which is ~3.5GiB) - LVM_SYSROOT_SIZE=20480 prepare_kickstart host1 kickstart-bootc.ks.template rhel96-bootc-source-optionals - launch_vm --boot_blueprint rhel96-bootc --vm_disksize 30 --vm_vcpus 4 + LVM_SYSROOT_SIZE=20480 prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source-optionals + launch_vm --boot_blueprint rhel98-bootc --vm_disksize 30 --vm_vcpus 4 } scenario_remove_vms() { diff --git a/test/scenarios-bootc/presubmits/el96-src@auto-recovery.sh b/test/scenarios-bootc/presubmits/el98-src@auto-recovery.sh similarity index 72% rename from test/scenarios-bootc/presubmits/el96-src@auto-recovery.sh rename to test/scenarios-bootc/presubmits/el98-src@auto-recovery.sh index fdcaadf92d..0501f42808 100644 --- a/test/scenarios-bootc/presubmits/el96-src@auto-recovery.sh +++ b/test/scenarios-bootc/presubmits/el98-src@auto-recovery.sh @@ -3,8 +3,8 @@ # Sourced from scenario.sh and uses functions defined there. scenario_create_vms() { - prepare_kickstart host1 kickstart-bootc.ks.template rhel96-bootc-source - launch_vm --boot_blueprint rhel96-bootc + prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source + launch_vm --boot_blueprint rhel98-bootc } scenario_remove_vms() { diff --git a/test/scenarios-bootc/presubmits/el96-src@backup-and-restore-on-reboot.sh b/test/scenarios-bootc/presubmits/el98-src@backup-and-restore-on-reboot.sh similarity index 69% rename from test/scenarios-bootc/presubmits/el96-src@backup-and-restore-on-reboot.sh rename to test/scenarios-bootc/presubmits/el98-src@backup-and-restore-on-reboot.sh index e85f3a12a8..4803929f1a 100644 --- a/test/scenarios-bootc/presubmits/el96-src@backup-and-restore-on-reboot.sh +++ b/test/scenarios-bootc/presubmits/el98-src@backup-and-restore-on-reboot.sh @@ -3,8 +3,8 @@ # Sourced from scenario.sh and uses functions defined there. scenario_create_vms() { - prepare_kickstart host1 kickstart-bootc.ks.template rhel96-bootc-source - launch_vm --boot_blueprint rhel96-bootc + prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source + launch_vm --boot_blueprint rhel98-bootc } scenario_remove_vms() { diff --git a/test/scenarios-bootc/presubmits/el96-src@backups.sh b/test/scenarios-bootc/presubmits/el98-src@backups.sh similarity index 68% rename from test/scenarios-bootc/presubmits/el96-src@backups.sh rename to test/scenarios-bootc/presubmits/el98-src@backups.sh index 296e4fde58..80a443461e 100644 --- a/test/scenarios-bootc/presubmits/el96-src@backups.sh +++ b/test/scenarios-bootc/presubmits/el98-src@backups.sh @@ -3,8 +3,8 @@ # Sourced from scenario.sh and uses functions defined there. scenario_create_vms() { - prepare_kickstart host1 kickstart-bootc.ks.template rhel96-bootc-source - launch_vm --boot_blueprint rhel96-bootc + prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source + launch_vm --boot_blueprint rhel98-bootc } scenario_remove_vms() { diff --git a/test/scenarios-bootc/presubmits/el96-src@configuration.sh b/test/scenarios-bootc/presubmits/el98-src@configuration.sh similarity index 67% rename from test/scenarios-bootc/presubmits/el96-src@configuration.sh rename to test/scenarios-bootc/presubmits/el98-src@configuration.sh index f71985c4de..cfd6c974cf 100644 --- a/test/scenarios-bootc/presubmits/el96-src@configuration.sh +++ b/test/scenarios-bootc/presubmits/el98-src@configuration.sh @@ -3,8 +3,8 @@ # Sourced from scenario.sh and uses functions defined there. scenario_create_vms() { - prepare_kickstart host1 kickstart-bootc.ks.template rhel96-bootc-source - launch_vm --boot_blueprint rhel96-bootc + prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source + launch_vm --boot_blueprint rhel98-bootc } scenario_remove_vms() { diff --git a/test/scenarios-bootc/presubmits/el96-src@downgrade-block.sh b/test/scenarios-bootc/presubmits/el98-src@downgrade-block.sh similarity index 65% rename from test/scenarios-bootc/presubmits/el96-src@downgrade-block.sh rename to test/scenarios-bootc/presubmits/el98-src@downgrade-block.sh index 892390b039..a2a8db5eee 100644 --- a/test/scenarios-bootc/presubmits/el96-src@downgrade-block.sh +++ b/test/scenarios-bootc/presubmits/el98-src@downgrade-block.sh @@ -3,8 +3,8 @@ # Sourced from scenario.sh and uses functions defined there. scenario_create_vms() { - prepare_kickstart host1 kickstart-bootc.ks.template rhel96-bootc-source-fake-next-minor - launch_vm --boot_blueprint rhel96-bootc + prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source-fake-next-minor + launch_vm --boot_blueprint rhel98-bootc } scenario_remove_vms() { @@ -13,7 +13,7 @@ scenario_remove_vms() { scenario_run_tests() { run_tests host1 \ - --variable "OLDER_MICROSHIFT_REF:rhel96-bootc-source" \ + --variable "OLDER_MICROSHIFT_REF:rhel98-bootc-source" \ --variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \ suites/upgrade/downgrade-block.robot } diff --git a/test/scenarios-bootc/presubmits/el96-src@dual-stack.sh b/test/scenarios-bootc/presubmits/el98-src@dual-stack.sh similarity index 66% rename from test/scenarios-bootc/presubmits/el96-src@dual-stack.sh rename to test/scenarios-bootc/presubmits/el98-src@dual-stack.sh index b1267588c3..e55680c6ae 100644 --- a/test/scenarios-bootc/presubmits/el96-src@dual-stack.sh +++ b/test/scenarios-bootc/presubmits/el98-src@dual-stack.sh @@ -3,8 +3,8 @@ # Sourced from scenario.sh and uses functions defined there. scenario_create_vms() { - prepare_kickstart host1 kickstart-bootc.ks.template rhel96-bootc-source - launch_vm --boot_blueprint rhel96-bootc --network "${VM_DUAL_STACK_NETWORK}" + prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source + launch_vm --boot_blueprint rhel98-bootc --network "${VM_DUAL_STACK_NETWORK}" } scenario_remove_vms() { diff --git a/test/scenarios-bootc/presubmits/el96-src@el100-src@upgrade-ok.sh b/test/scenarios-bootc/presubmits/el98-src@el100-src@upgrade-ok.sh similarity index 77% rename from test/scenarios-bootc/presubmits/el96-src@el100-src@upgrade-ok.sh rename to test/scenarios-bootc/presubmits/el98-src@el100-src@upgrade-ok.sh index 4c5a9f5d8f..e8ea1f391d 100644 --- a/test/scenarios-bootc/presubmits/el96-src@el100-src@upgrade-ok.sh +++ b/test/scenarios-bootc/presubmits/el98-src@el100-src@upgrade-ok.sh @@ -3,8 +3,8 @@ # Sourced from scenario.sh and uses functions defined there. scenario_create_vms() { - prepare_kickstart host1 kickstart-bootc.ks.template rhel96-bootc-source - launch_vm --boot_blueprint rhel96-bootc + prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source + launch_vm --boot_blueprint rhel98-bootc } scenario_remove_vms() { diff --git a/test/scenarios-bootc/presubmits/el96-src@ipv6.sh b/test/scenarios-bootc/presubmits/el98-src@ipv6.sh similarity index 88% rename from test/scenarios-bootc/presubmits/el96-src@ipv6.sh rename to test/scenarios-bootc/presubmits/el98-src@ipv6.sh index 5f141e7642..c2d71880f2 100644 --- a/test/scenarios-bootc/presubmits/el96-src@ipv6.sh +++ b/test/scenarios-bootc/presubmits/el98-src@ipv6.sh @@ -16,8 +16,8 @@ MIRROR_REGISTRY_URL="$(hostname):${MIRROR_REGISTRY_PORT}/microshift" scenario_create_vms() { # Enable IPv6 single stack in kickstart - prepare_kickstart host1 kickstart-bootc.ks.template rhel96-bootc-source false true - launch_vm --boot_blueprint rhel96-bootc --network "${VM_IPV6_NETWORK}" + prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source false true + launch_vm --boot_blueprint rhel98-bootc --network "${VM_IPV6_NETWORK}" } scenario_remove_vms() { diff --git a/test/scenarios-bootc/presubmits/el96-src@multi-nic.sh b/test/scenarios-bootc/presubmits/el98-src@multi-nic.sh similarity index 84% rename from test/scenarios-bootc/presubmits/el96-src@multi-nic.sh rename to test/scenarios-bootc/presubmits/el98-src@multi-nic.sh index b674a91231..1b4e21ea9d 100644 --- a/test/scenarios-bootc/presubmits/el96-src@multi-nic.sh +++ b/test/scenarios-bootc/presubmits/el98-src@multi-nic.sh @@ -3,9 +3,9 @@ # Sourced from scenario.sh and uses functions defined there. scenario_create_vms() { - prepare_kickstart host1 kickstart-bootc.ks.template rhel96-bootc-source + prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source # Using multus as secondary network to have 2 nics in different networks. - launch_vm --boot_blueprint rhel96-bootc --network default,"${VM_MULTUS_NETWORK}" + launch_vm --boot_blueprint rhel98-bootc --network default,"${VM_MULTUS_NETWORK}" } scenario_remove_vms() { diff --git a/test/scenarios-bootc/presubmits/el96-src@optional.sh b/test/scenarios-bootc/presubmits/el98-src@optional.sh similarity index 92% rename from test/scenarios-bootc/presubmits/el96-src@optional.sh rename to test/scenarios-bootc/presubmits/el98-src@optional.sh index 636dd60370..64b5b6e9fb 100644 --- a/test/scenarios-bootc/presubmits/el96-src@optional.sh +++ b/test/scenarios-bootc/presubmits/el98-src@optional.sh @@ -17,9 +17,9 @@ scenario_create_vms() { if [[ "${UNAME_M}" =~ aarch64 ]]; then networks="${VM_MULTUS_NETWORK},${VM_MULTUS_NETWORK}" fi - LVM_SYSROOT_SIZE=20480 prepare_kickstart host1 kickstart-bootc.ks.template rhel96-bootc-source-optionals + LVM_SYSROOT_SIZE=20480 prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source-optionals # Three nics - one for sriov, one for macvlan, another for ipvlan (they cannot enslave the same interface) - launch_vm --boot_blueprint rhel96-bootc --network "${networks}" --vm_disksize 25 --vm_vcpus 4 + launch_vm --boot_blueprint rhel98-bootc --network "${networks}" --vm_disksize 25 --vm_vcpus 4 } scenario_remove_vms() { diff --git a/test/scenarios-bootc/presubmits/el96-src@router.sh b/test/scenarios-bootc/presubmits/el98-src@router.sh similarity index 68% rename from test/scenarios-bootc/presubmits/el96-src@router.sh rename to test/scenarios-bootc/presubmits/el98-src@router.sh index 59dec2a94a..52cbaaae28 100644 --- a/test/scenarios-bootc/presubmits/el96-src@router.sh +++ b/test/scenarios-bootc/presubmits/el98-src@router.sh @@ -3,8 +3,8 @@ # Sourced from scenario.sh and uses functions defined there. scenario_create_vms() { - prepare_kickstart host1 kickstart-bootc.ks.template rhel96-bootc-source - launch_vm --boot_blueprint rhel96-bootc + prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source + launch_vm --boot_blueprint rhel98-bootc } scenario_remove_vms() { diff --git a/test/scenarios-bootc/presubmits/el96-src@standard-suite1.sh b/test/scenarios-bootc/presubmits/el98-src@standard-suite1.sh similarity index 72% rename from test/scenarios-bootc/presubmits/el96-src@standard-suite1.sh rename to test/scenarios-bootc/presubmits/el98-src@standard-suite1.sh index 558784fcd9..4bfea866c1 100644 --- a/test/scenarios-bootc/presubmits/el96-src@standard-suite1.sh +++ b/test/scenarios-bootc/presubmits/el98-src@standard-suite1.sh @@ -3,8 +3,8 @@ # Sourced from scenario.sh and uses functions defined there. scenario_create_vms() { - prepare_kickstart host1 kickstart-bootc.ks.template rhel96-bootc-source - launch_vm --boot_blueprint rhel96-bootc + prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source + launch_vm --boot_blueprint rhel98-bootc } scenario_remove_vms() { @@ -15,7 +15,7 @@ scenario_run_tests() { # The SYNC_FREQUENCY is set to a shorter-than-default value to speed up # pre-submit scenario completion time in DNS tests. run_tests host1 \ - --variable "EXPECTED_OS_VERSION:9.6" \ + --variable "EXPECTED_OS_VERSION:9.8" \ --variable "SYNC_FREQUENCY:5s" \ suites/standard1/ } diff --git a/test/scenarios-bootc/presubmits/el96-src@standard-suite2.sh b/test/scenarios-bootc/presubmits/el98-src@standard-suite2.sh similarity index 67% rename from test/scenarios-bootc/presubmits/el96-src@standard-suite2.sh rename to test/scenarios-bootc/presubmits/el98-src@standard-suite2.sh index cd802eabf7..f56df46424 100644 --- a/test/scenarios-bootc/presubmits/el96-src@standard-suite2.sh +++ b/test/scenarios-bootc/presubmits/el98-src@standard-suite2.sh @@ -3,8 +3,8 @@ # Sourced from scenario.sh and uses functions defined there. scenario_create_vms() { - prepare_kickstart host1 kickstart-bootc.ks.template rhel96-bootc-source - launch_vm --boot_blueprint rhel96-bootc + prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source + launch_vm --boot_blueprint rhel98-bootc } scenario_remove_vms() { diff --git a/test/scenarios-bootc/presubmits/el96-src@storage.sh b/test/scenarios-bootc/presubmits/el98-src@storage.sh similarity index 67% rename from test/scenarios-bootc/presubmits/el96-src@storage.sh rename to test/scenarios-bootc/presubmits/el98-src@storage.sh index 0bf54cd542..bb266bddca 100644 --- a/test/scenarios-bootc/presubmits/el96-src@storage.sh +++ b/test/scenarios-bootc/presubmits/el98-src@storage.sh @@ -3,8 +3,8 @@ # Sourced from scenario.sh and uses functions defined there. scenario_create_vms() { - prepare_kickstart host1 kickstart-bootc.ks.template rhel96-bootc-source - launch_vm --boot_blueprint rhel96-bootc + prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source + launch_vm --boot_blueprint rhel98-bootc } scenario_remove_vms() { diff --git a/test/scenarios-bootc/presubmits/el96-src@upgrade-fails-then-recovers.sh b/test/scenarios-bootc/presubmits/el98-src@upgrade-fails-then-recovers.sh similarity index 65% rename from test/scenarios-bootc/presubmits/el96-src@upgrade-fails-then-recovers.sh rename to test/scenarios-bootc/presubmits/el98-src@upgrade-fails-then-recovers.sh index 9f8010e634..9184caa7a8 100644 --- a/test/scenarios-bootc/presubmits/el96-src@upgrade-fails-then-recovers.sh +++ b/test/scenarios-bootc/presubmits/el98-src@upgrade-fails-then-recovers.sh @@ -3,8 +3,8 @@ # Sourced from scenario.sh and uses functions defined there. scenario_create_vms() { - prepare_kickstart host1 kickstart-bootc.ks.template rhel96-bootc-source - launch_vm --boot_blueprint rhel96-bootc + prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source + launch_vm --boot_blueprint rhel98-bootc } scenario_remove_vms() { @@ -13,7 +13,7 @@ scenario_remove_vms() { scenario_run_tests() { run_tests host1 \ - --variable "TARGET_REF:rhel96-bootc-source-fake-next-minor" \ + --variable "TARGET_REF:rhel98-bootc-source-fake-next-minor" \ --variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \ suites/upgrade/upgrade-fails-then-recovers.robot } diff --git a/test/scenarios-bootc/presubmits/el96-src@upgrade-fails.sh b/test/scenarios-bootc/presubmits/el98-src@upgrade-fails.sh similarity index 69% rename from test/scenarios-bootc/presubmits/el96-src@upgrade-fails.sh rename to test/scenarios-bootc/presubmits/el98-src@upgrade-fails.sh index 2108cef476..22e0c053bd 100644 --- a/test/scenarios-bootc/presubmits/el96-src@upgrade-fails.sh +++ b/test/scenarios-bootc/presubmits/el98-src@upgrade-fails.sh @@ -3,8 +3,8 @@ # Sourced from scenario.sh and uses functions defined there. scenario_create_vms() { - prepare_kickstart host1 kickstart-bootc.ks.template rhel96-bootc-source - launch_vm --boot_blueprint rhel96-bootc + prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source + launch_vm --boot_blueprint rhel98-bootc } scenario_remove_vms() { @@ -13,7 +13,7 @@ scenario_remove_vms() { scenario_run_tests() { run_tests host1 \ - --variable "FAILING_REF:rhel96-bootc-source-aux" \ + --variable "FAILING_REF:rhel98-bootc-source-aux" \ --variable "REASON:fail_greenboot" \ --variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \ suites/upgrade/upgrade-fails-and-rolls-back.robot From 928ed42dcb8861eea1621dc3b303fffc47bb2f25 Mon Sep 17 00:00:00 2001 From: Gregory Giguashvili Date: Mon, 23 Feb 2026 14:13:11 +0200 Subject: [PATCH 5/8] Add early-kernel repository for RHEL 9.8 --- test/package-sources-bootc/rhel98-mirror.repo | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/package-sources-bootc/rhel98-mirror.repo b/test/package-sources-bootc/rhel98-mirror.repo index 0a0eab5fd7..81a52b27d5 100644 --- a/test/package-sources-bootc/rhel98-mirror.repo +++ b/test/package-sources-bootc/rhel98-mirror.repo @@ -14,3 +14,11 @@ enabled = 1 sslverify = false gpgcheck = 0 skip_if_unavailable = false + +[rhel-9.8-early-kernel] +name = rhel-9.8-early-kernel +baseurl = http://localhost:{{ .Env.WEB_SERVER_PORT }}/ocp-mirror/reposync/4.22{{ if eq .Env.UNAME_M "aarch64" }}_aarch64{{ end }}/rhel-98-early-kernel +enabled = 1 +sslverify = false +gpgcheck = 0 +skip_if_unavailable = false From d0c4aa91c96f9f3b3419d1dc4d807ed2293456e6 Mon Sep 17 00:00:00 2001 From: Gregory Giguashvili Date: Mon, 23 Feb 2026 14:17:03 +0200 Subject: [PATCH 6/8] Increase priority of RHOCP mirror repositories --- test/package-sources-bootc/microshift-rhocp-y.repo | 3 +++ test/package-sources-bootc/microshift-rhocp-y1.repo | 3 +++ 2 files changed, 6 insertions(+) diff --git a/test/package-sources-bootc/microshift-rhocp-y.repo b/test/package-sources-bootc/microshift-rhocp-y.repo index d09ec1e9ae..ba497e874e 100644 --- a/test/package-sources-bootc/microshift-rhocp-y.repo +++ b/test/package-sources-bootc/microshift-rhocp-y.repo @@ -17,5 +17,8 @@ baseurl = {{ .Env.RHOCP_MINOR_Y_BETA }} enabled=1 gpgcheck=0 sslverify=1 +# Increase the priority of the RHOCP beta repository to ensure its packages take +# precedence over RHEL mirror repositories +priority=50 skip_if_unavailable=0 {{- end -}} diff --git a/test/package-sources-bootc/microshift-rhocp-y1.repo b/test/package-sources-bootc/microshift-rhocp-y1.repo index 38ba2ce561..bac774cb88 100644 --- a/test/package-sources-bootc/microshift-rhocp-y1.repo +++ b/test/package-sources-bootc/microshift-rhocp-y1.repo @@ -17,5 +17,8 @@ baseurl = {{ .Env.RHOCP_MINOR_Y1_BETA }} enabled=1 gpgcheck=0 sslverify=1 +# Increase the priority of the RHOCP beta repository to ensure its packages take +# precedence over RHEL mirror repositories +priority=50 skip_if_unavailable=0 {{- end -}} From d511766a050a5f10b0dae132f766b27457cce1d3 Mon Sep 17 00:00:00 2001 From: Gregory Giguashvili Date: Mon, 23 Feb 2026 14:17:38 +0200 Subject: [PATCH 7/8] Fix starting message in manage_webserver.sh --- test/bin/manage_webserver.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/bin/manage_webserver.sh b/test/bin/manage_webserver.sh index 414b99b31c..5c5fc907b1 100755 --- a/test/bin/manage_webserver.sh +++ b/test/bin/manage_webserver.sh @@ -33,7 +33,6 @@ action_stop() { } action_start() { - echo "Starting web server in ${IMAGEDIR}" mkdir -p "${IMAGEDIR}" cd "${IMAGEDIR}" @@ -76,6 +75,8 @@ EOF # Restart the nginx web server action_stop + + echo "Starting web server in ${IMAGEDIR}" nginx \ -c "${NGINX_CONFIG}" \ -e "${IMAGEDIR}/nginx.log" From 519c7966f8e2c20876126fbb5539b3fc82044178 Mon Sep 17 00:00:00 2001 From: Gregory Giguashvili Date: Mon, 23 Feb 2026 16:59:47 +0200 Subject: [PATCH 8/8] Update periodic scenarios --- ...=> el96-prel@el98-src@upgrade-fails-and-rolls-back.sh} | 2 +- ...src@upgrade-ok.sh => el96-prel@el98-src@upgrade-ok.sh} | 2 +- ...k.sh => el96-prel@el98-src@upgrade-ostree2bootc-ok.sh} | 2 +- ...@upgrade-ok.sh => el96-yminus2@el98-src@upgrade-ok.sh} | 2 +- ...h => el96-yminus2@el98-src@upgrade-ostree2bootc-ok.sh} | 2 +- ...ng-offline.sh => el98-src@ai-model-serving-offline.sh} | 4 ++-- ...c@cncf-conformance.sh => el98-src@cncf-conformance.sh} | 8 ++++---- ...greenboot.sh => el98-src@fault-tests-and-greenboot.sh} | 4 ++-- .../periodics/{el96-src@fips.sh => el98-src@fips.sh} | 4 ++-- ....sh => el98-src@gitops-telemetry-clusterid-systemd.sh} | 4 ++-- ...{el96-src@isolated-net.sh => el98-src@isolated-net.sh} | 4 ++-- .../{el96-src@offline.sh => el98-src@offline.sh} | 4 ++-- ...-cleanup-data.sh => el98-src@osconfig-cleanup-data.sh} | 4 ++-- ...config-lifecycle.sh => el98-src@osconfig-lifecycle.sh} | 4 ++-- ...-backup.sh => el98-src@upgrade-fails-cannot-backup.sh} | 6 +++--- 15 files changed, 28 insertions(+), 28 deletions(-) rename test/scenarios-bootc/periodics/{el96-prel@el96-src@upgrade-fails-and-rolls-back.sh => el96-prel@el98-src@upgrade-fails-and-rolls-back.sh} (89%) rename test/scenarios-bootc/periodics/{el96-prel@el96-src@upgrade-ok.sh => el96-prel@el98-src@upgrade-ok.sh} (91%) rename test/scenarios-bootc/periodics/{el96-prel@el96-src@upgrade-ostree2bootc-ok.sh => el96-prel@el98-src@upgrade-ostree2bootc-ok.sh} (91%) rename test/scenarios-bootc/periodics/{el96-yminus2@el96-src@upgrade-ok.sh => el96-yminus2@el98-src@upgrade-ok.sh} (88%) rename test/scenarios-bootc/periodics/{el96-yminus2@el96-src@upgrade-ostree2bootc-ok.sh => el96-yminus2@el98-src@upgrade-ostree2bootc-ok.sh} (90%) rename test/scenarios-bootc/periodics/{el96-src@ai-model-serving-offline.sh => el98-src@ai-model-serving-offline.sh} (88%) rename test/scenarios-bootc/periodics/{el96-src@cncf-conformance.sh => el98-src@cncf-conformance.sh} (96%) rename test/scenarios-bootc/periodics/{el96-src@fault-tests-and-greenboot.sh => el98-src@fault-tests-and-greenboot.sh} (70%) rename test/scenarios-bootc/periodics/{el96-src@fips.sh => el98-src@fips.sh} (79%) rename test/scenarios-bootc/periodics/{el96-src@gitops-telemetry-clusterid-systemd.sh => el98-src@gitops-telemetry-clusterid-systemd.sh} (82%) rename test/scenarios-bootc/periodics/{el96-src@isolated-net.sh => el98-src@isolated-net.sh} (86%) rename test/scenarios-bootc/periodics/{el96-src@offline.sh => el98-src@offline.sh} (81%) rename test/scenarios-bootc/periodics/{el96-src@osconfig-cleanup-data.sh => el98-src@osconfig-cleanup-data.sh} (69%) rename test/scenarios-bootc/periodics/{el96-src@osconfig-lifecycle.sh => el98-src@osconfig-lifecycle.sh} (68%) rename test/scenarios-bootc/periodics/{el96-src@upgrade-fails-cannot-backup.sh => el98-src@upgrade-fails-cannot-backup.sh} (69%) diff --git a/test/scenarios-bootc/periodics/el96-prel@el96-src@upgrade-fails-and-rolls-back.sh b/test/scenarios-bootc/periodics/el96-prel@el98-src@upgrade-fails-and-rolls-back.sh similarity index 89% rename from test/scenarios-bootc/periodics/el96-prel@el96-src@upgrade-fails-and-rolls-back.sh rename to test/scenarios-bootc/periodics/el96-prel@el98-src@upgrade-fails-and-rolls-back.sh index 9b7cba71bf..069e7fe70e 100644 --- a/test/scenarios-bootc/periodics/el96-prel@el96-src@upgrade-fails-and-rolls-back.sh +++ b/test/scenarios-bootc/periodics/el96-prel@el98-src@upgrade-fails-and-rolls-back.sh @@ -13,7 +13,7 @@ scenario_remove_vms() { scenario_run_tests() { run_tests host1 \ - --variable "FAILING_REF:rhel96-bootc-source" \ + --variable "FAILING_REF:rhel98-bootc-source" \ --variable "REASON:fail_greenboot" \ --variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \ suites/upgrade/upgrade-fails-and-rolls-back.robot diff --git a/test/scenarios-bootc/periodics/el96-prel@el96-src@upgrade-ok.sh b/test/scenarios-bootc/periodics/el96-prel@el98-src@upgrade-ok.sh similarity index 91% rename from test/scenarios-bootc/periodics/el96-prel@el96-src@upgrade-ok.sh rename to test/scenarios-bootc/periodics/el96-prel@el98-src@upgrade-ok.sh index 0dd63d289a..f15e5936d8 100644 --- a/test/scenarios-bootc/periodics/el96-prel@el96-src@upgrade-ok.sh +++ b/test/scenarios-bootc/periodics/el96-prel@el98-src@upgrade-ok.sh @@ -21,7 +21,7 @@ scenario_run_tests() { exit_if_image_not_found "${start_image}" run_tests host1 \ - --variable "TARGET_REF:rhel96-bootc-source" \ + --variable "TARGET_REF:rhel98-bootc-source" \ --variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \ suites/upgrade/upgrade-successful.robot } diff --git a/test/scenarios-bootc/periodics/el96-prel@el96-src@upgrade-ostree2bootc-ok.sh b/test/scenarios-bootc/periodics/el96-prel@el98-src@upgrade-ostree2bootc-ok.sh similarity index 91% rename from test/scenarios-bootc/periodics/el96-prel@el96-src@upgrade-ostree2bootc-ok.sh rename to test/scenarios-bootc/periodics/el96-prel@el98-src@upgrade-ostree2bootc-ok.sh index 77d7ed364a..fb461ee1ee 100644 --- a/test/scenarios-bootc/periodics/el96-prel@el96-src@upgrade-ostree2bootc-ok.sh +++ b/test/scenarios-bootc/periodics/el96-prel@el98-src@upgrade-ostree2bootc-ok.sh @@ -15,7 +15,7 @@ scenario_remove_vms() { scenario_run_tests() { run_tests host1 \ - --variable "TARGET_REF:rhel96-bootc-source" \ + --variable "TARGET_REF:rhel98-bootc-source" \ --variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \ suites/upgrade/upgrade-successful.robot } diff --git a/test/scenarios-bootc/periodics/el96-yminus2@el96-src@upgrade-ok.sh b/test/scenarios-bootc/periodics/el96-yminus2@el98-src@upgrade-ok.sh similarity index 88% rename from test/scenarios-bootc/periodics/el96-yminus2@el96-src@upgrade-ok.sh rename to test/scenarios-bootc/periodics/el96-yminus2@el98-src@upgrade-ok.sh index f32d0cf994..2eaee51b12 100644 --- a/test/scenarios-bootc/periodics/el96-yminus2@el96-src@upgrade-ok.sh +++ b/test/scenarios-bootc/periodics/el96-yminus2@el98-src@upgrade-ok.sh @@ -13,7 +13,7 @@ scenario_remove_vms() { scenario_run_tests() { run_tests host1 \ - --variable "TARGET_REF:rhel96-bootc-source" \ + --variable "TARGET_REF:rhel98-bootc-source" \ --variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \ suites/upgrade/upgrade-successful.robot } diff --git a/test/scenarios-bootc/periodics/el96-yminus2@el96-src@upgrade-ostree2bootc-ok.sh b/test/scenarios-bootc/periodics/el96-yminus2@el98-src@upgrade-ostree2bootc-ok.sh similarity index 90% rename from test/scenarios-bootc/periodics/el96-yminus2@el96-src@upgrade-ostree2bootc-ok.sh rename to test/scenarios-bootc/periodics/el96-yminus2@el98-src@upgrade-ostree2bootc-ok.sh index 435e6d332c..06e5ac3a86 100644 --- a/test/scenarios-bootc/periodics/el96-yminus2@el96-src@upgrade-ostree2bootc-ok.sh +++ b/test/scenarios-bootc/periodics/el96-yminus2@el98-src@upgrade-ostree2bootc-ok.sh @@ -15,7 +15,7 @@ scenario_remove_vms() { scenario_run_tests() { run_tests host1 \ - --variable "TARGET_REF:rhel96-bootc-source" \ + --variable "TARGET_REF:rhel98-bootc-source" \ --variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \ suites/upgrade/upgrade-successful.robot } diff --git a/test/scenarios-bootc/periodics/el96-src@ai-model-serving-offline.sh b/test/scenarios-bootc/periodics/el98-src@ai-model-serving-offline.sh similarity index 88% rename from test/scenarios-bootc/periodics/el96-src@ai-model-serving-offline.sh rename to test/scenarios-bootc/periodics/el98-src@ai-model-serving-offline.sh index af7d3495ea..7b4f93d526 100644 --- a/test/scenarios-bootc/periodics/el96-src@ai-model-serving-offline.sh +++ b/test/scenarios-bootc/periodics/el98-src@ai-model-serving-offline.sh @@ -18,8 +18,8 @@ scenario_create_vms() { check_platform true # Increased disk size because of the additional embedded images (especially OVMS which is ~3.5GiB) - LVM_SYSROOT_SIZE=20480 prepare_kickstart host1 kickstart-bootc-offline.ks.template rhel96-bootc-source-ai-model-serving - launch_vm --boot_blueprint rhel96-bootc-source-ai-model-serving --no_network --vm_disksize 30 + LVM_SYSROOT_SIZE=20480 prepare_kickstart host1 kickstart-bootc-offline.ks.template rhel98-bootc-source-ai-model-serving + launch_vm --boot_blueprint rhel98-bootc-source-ai-model-serving --no_network --vm_disksize 30 } scenario_remove_vms() { diff --git a/test/scenarios-bootc/periodics/el96-src@cncf-conformance.sh b/test/scenarios-bootc/periodics/el98-src@cncf-conformance.sh similarity index 96% rename from test/scenarios-bootc/periodics/el96-src@cncf-conformance.sh rename to test/scenarios-bootc/periodics/el98-src@cncf-conformance.sh index 7db1848212..f4b38b3812 100644 --- a/test/scenarios-bootc/periodics/el96-src@cncf-conformance.sh +++ b/test/scenarios-bootc/periodics/el98-src@cncf-conformance.sh @@ -171,10 +171,10 @@ run_sonobuoy() { } scenario_create_vms() { - prepare_kickstart host1 kickstart-bootc.ks.template rhel96-bootc-source - prepare_kickstart host2 kickstart-bootc.ks.template rhel96-bootc-source - launch_vm --vmname host1 --boot_blueprint rhel96-bootc - launch_vm --vmname host2 --boot_blueprint rhel96-bootc + prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source + prepare_kickstart host2 kickstart-bootc.ks.template rhel98-bootc-source + launch_vm --vmname host1 --boot_blueprint rhel98-bootc + launch_vm --vmname host2 --boot_blueprint rhel98-bootc } scenario_remove_vms() { diff --git a/test/scenarios-bootc/periodics/el96-src@fault-tests-and-greenboot.sh b/test/scenarios-bootc/periodics/el98-src@fault-tests-and-greenboot.sh similarity index 70% rename from test/scenarios-bootc/periodics/el96-src@fault-tests-and-greenboot.sh rename to test/scenarios-bootc/periodics/el98-src@fault-tests-and-greenboot.sh index 3b0e2227dc..1ff55f9094 100644 --- a/test/scenarios-bootc/periodics/el96-src@fault-tests-and-greenboot.sh +++ b/test/scenarios-bootc/periodics/el98-src@fault-tests-and-greenboot.sh @@ -3,8 +3,8 @@ # Sourced from scenario.sh and uses functions defined there. scenario_create_vms() { - prepare_kickstart host1 kickstart-bootc.ks.template rhel96-bootc-source - launch_vm --boot_blueprint rhel96-bootc + prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source + launch_vm --boot_blueprint rhel98-bootc } scenario_remove_vms() { diff --git a/test/scenarios-bootc/periodics/el96-src@fips.sh b/test/scenarios-bootc/periodics/el98-src@fips.sh similarity index 79% rename from test/scenarios-bootc/periodics/el96-src@fips.sh rename to test/scenarios-bootc/periodics/el98-src@fips.sh index 4b3dd7e62c..f1dd0c842c 100644 --- a/test/scenarios-bootc/periodics/el96-src@fips.sh +++ b/test/scenarios-bootc/periodics/el98-src@fips.sh @@ -12,8 +12,8 @@ check_platform() { scenario_create_vms() { check_platform - prepare_kickstart host1 kickstart-bootc.ks.template rhel96-bootc-source-fips true - launch_vm --boot_blueprint rhel96-bootc --fips + prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source-fips true + launch_vm --boot_blueprint rhel98-bootc --fips } scenario_remove_vms() { diff --git a/test/scenarios-bootc/periodics/el96-src@gitops-telemetry-clusterid-systemd.sh b/test/scenarios-bootc/periodics/el98-src@gitops-telemetry-clusterid-systemd.sh similarity index 82% rename from test/scenarios-bootc/periodics/el96-src@gitops-telemetry-clusterid-systemd.sh rename to test/scenarios-bootc/periodics/el98-src@gitops-telemetry-clusterid-systemd.sh index 306ad29510..6be0728f05 100755 --- a/test/scenarios-bootc/periodics/el96-src@gitops-telemetry-clusterid-systemd.sh +++ b/test/scenarios-bootc/periodics/el98-src@gitops-telemetry-clusterid-systemd.sh @@ -3,8 +3,8 @@ # Sourced from scenario.sh and uses functions defined there. scenario_create_vms() { - prepare_kickstart host1 kickstart-bootc.ks.template rhel96-bootc-source-gitops - launch_vm --boot_blueprint rhel96-bootc + prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source-gitops + launch_vm --boot_blueprint rhel98-bootc } scenario_remove_vms() { diff --git a/test/scenarios-bootc/periodics/el96-src@isolated-net.sh b/test/scenarios-bootc/periodics/el98-src@isolated-net.sh similarity index 86% rename from test/scenarios-bootc/periodics/el96-src@isolated-net.sh rename to test/scenarios-bootc/periodics/el98-src@isolated-net.sh index 8696a7b052..dfd7cce77b 100644 --- a/test/scenarios-bootc/periodics/el96-src@isolated-net.sh +++ b/test/scenarios-bootc/periodics/el98-src@isolated-net.sh @@ -8,9 +8,9 @@ VM_BRIDGE_IP="$(get_vm_bridge_ip "${VM_ISOLATED_NETWORK}")" MIRROR_REGISTRY_URL="${VM_BRIDGE_IP}:${MIRROR_REGISTRY_PORT}/microshift" scenario_create_vms() { - prepare_kickstart host1 kickstart-bootc-isolated.ks.template rhel96-bootc-source-isolated + prepare_kickstart host1 kickstart-bootc-isolated.ks.template rhel98-bootc-source-isolated # Use the isolated network when creating a VM - launch_vm --boot_blueprint rhel96-bootc --network "${VM_ISOLATED_NETWORK}" + launch_vm --boot_blueprint rhel98-bootc --network "${VM_ISOLATED_NETWORK}" } scenario_remove_vms() { diff --git a/test/scenarios-bootc/periodics/el96-src@offline.sh b/test/scenarios-bootc/periodics/el98-src@offline.sh similarity index 81% rename from test/scenarios-bootc/periodics/el96-src@offline.sh rename to test/scenarios-bootc/periodics/el98-src@offline.sh index 2d04ad354b..1e25050f3e 100644 --- a/test/scenarios-bootc/periodics/el96-src@offline.sh +++ b/test/scenarios-bootc/periodics/el98-src@offline.sh @@ -3,8 +3,8 @@ # Sourced from scenario.sh and uses functions defined there. scenario_create_vms() { - prepare_kickstart host1 kickstart-bootc-offline.ks.template rhel96-bootc-source-isolated - launch_vm --boot_blueprint rhel96-bootc-source-isolated --no_network + prepare_kickstart host1 kickstart-bootc-offline.ks.template rhel98-bootc-source-isolated + launch_vm --boot_blueprint rhel98-bootc-source-isolated --no_network } scenario_remove_vms() { diff --git a/test/scenarios-bootc/periodics/el96-src@osconfig-cleanup-data.sh b/test/scenarios-bootc/periodics/el98-src@osconfig-cleanup-data.sh similarity index 69% rename from test/scenarios-bootc/periodics/el96-src@osconfig-cleanup-data.sh rename to test/scenarios-bootc/periodics/el98-src@osconfig-cleanup-data.sh index e94385dd69..0256bfef27 100644 --- a/test/scenarios-bootc/periodics/el96-src@osconfig-cleanup-data.sh +++ b/test/scenarios-bootc/periodics/el98-src@osconfig-cleanup-data.sh @@ -3,8 +3,8 @@ # Sourced from scenario.sh and uses functions defined there. scenario_create_vms() { - prepare_kickstart host1 kickstart-bootc.ks.template rhel96-bootc-source - launch_vm --boot_blueprint rhel96-bootc + prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source + launch_vm --boot_blueprint rhel98-bootc } scenario_remove_vms() { diff --git a/test/scenarios-bootc/periodics/el96-src@osconfig-lifecycle.sh b/test/scenarios-bootc/periodics/el98-src@osconfig-lifecycle.sh similarity index 68% rename from test/scenarios-bootc/periodics/el96-src@osconfig-lifecycle.sh rename to test/scenarios-bootc/periodics/el98-src@osconfig-lifecycle.sh index 7e1a7d0246..1ee47686a4 100644 --- a/test/scenarios-bootc/periodics/el96-src@osconfig-lifecycle.sh +++ b/test/scenarios-bootc/periodics/el98-src@osconfig-lifecycle.sh @@ -3,8 +3,8 @@ # Sourced from scenario.sh and uses functions defined there. scenario_create_vms() { - prepare_kickstart host1 kickstart-bootc.ks.template rhel96-bootc-source - launch_vm --boot_blueprint rhel96-bootc + prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source + launch_vm --boot_blueprint rhel98-bootc } scenario_remove_vms() { diff --git a/test/scenarios-bootc/periodics/el96-src@upgrade-fails-cannot-backup.sh b/test/scenarios-bootc/periodics/el98-src@upgrade-fails-cannot-backup.sh similarity index 69% rename from test/scenarios-bootc/periodics/el96-src@upgrade-fails-cannot-backup.sh rename to test/scenarios-bootc/periodics/el98-src@upgrade-fails-cannot-backup.sh index 32e0ebbe63..da131e9f63 100644 --- a/test/scenarios-bootc/periodics/el96-src@upgrade-fails-cannot-backup.sh +++ b/test/scenarios-bootc/periodics/el98-src@upgrade-fails-cannot-backup.sh @@ -3,8 +3,8 @@ # Sourced from scenario.sh and uses functions defined there. scenario_create_vms() { - prepare_kickstart host1 kickstart-bootc.ks.template rhel96-bootc-source - launch_vm --boot_blueprint rhel96-bootc + prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source + launch_vm --boot_blueprint rhel98-bootc } scenario_remove_vms() { @@ -13,7 +13,7 @@ scenario_remove_vms() { scenario_run_tests() { run_tests host1 \ - --variable "FAILING_REF:rhel96-bootc-source-aux" \ + --variable "FAILING_REF:rhel98-bootc-source-aux" \ --variable "REASON:prevent_backup" \ --variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \ suites/upgrade/upgrade-fails-and-rolls-back.robot