From edb46d7786c61120d1646a5eee2c107a0e558956 Mon Sep 17 00:00:00 2001 From: vanhalenar Date: Wed, 18 Feb 2026 11:22:39 +0000 Subject: [PATCH 01/19] Bump 10.0 bootc scenarios to 10.2 --- .../{el100-src@optional.sh => el102-src@optional.sh} | 4 ++-- ...-src@standard-suite1.sh => el102-src@standard-suite1.sh} | 4 ++-- ...-src@standard-suite2.sh => el102-src@standard-suite2.sh} | 4 ++-- ...sh => el96-yminus2@el102-src@upgrade-ostree2bootc-ok.sh} | 2 +- ...-src@upgrade-ok.sh => el96-prel@el102-src@upgrade-ok.sh} | 2 +- ...c@upgrade-ok.sh => el96-yminus2@el102-src@upgrade-ok.sh} | 2 +- ...l100-lrel@ginkgo-tests.sh => el102-lrel@ginkgo-tests.sh} | 4 ++-- .../{el100-lrel@optional.sh => el102-lrel@optional.sh} | 4 ++-- .../{el100-lrel@standard1.sh => el102-lrel@standard1.sh} | 6 +++--- .../{el100-lrel@standard2.sh => el102-lrel@standard2.sh} | 4 ++-- 10 files changed, 18 insertions(+), 18 deletions(-) rename test/scenarios-bootc/periodics/{el100-src@optional.sh => el102-src@optional.sh} (92%) rename test/scenarios-bootc/periodics/{el100-src@standard-suite1.sh => el102-src@standard-suite1.sh} (72%) rename test/scenarios-bootc/periodics/{el100-src@standard-suite2.sh => el102-src@standard-suite2.sh} (67%) rename test/scenarios-bootc/periodics/{el96-yminus2@el100-src@upgrade-ostree2bootc-ok.sh => el96-yminus2@el102-src@upgrade-ostree2bootc-ok.sh} (90%) rename test/scenarios-bootc/presubmits/{el96-prel@el100-src@upgrade-ok.sh => el96-prel@el102-src@upgrade-ok.sh} (91%) rename test/scenarios-bootc/presubmits/{el96-yminus2@el100-src@upgrade-ok.sh => el96-yminus2@el102-src@upgrade-ok.sh} (88%) rename test/scenarios-bootc/releases/{el100-lrel@ginkgo-tests.sh => el102-lrel@ginkgo-tests.sh} (87%) rename test/scenarios-bootc/releases/{el100-lrel@optional.sh => el102-lrel@optional.sh} (93%) rename test/scenarios-bootc/releases/{el100-lrel@standard1.sh => el102-lrel@standard1.sh} (82%) rename test/scenarios-bootc/releases/{el100-lrel@standard2.sh => el102-lrel@standard2.sh} (86%) diff --git a/test/scenarios-bootc/periodics/el100-src@optional.sh b/test/scenarios-bootc/periodics/el102-src@optional.sh similarity index 92% rename from test/scenarios-bootc/periodics/el100-src@optional.sh rename to test/scenarios-bootc/periodics/el102-src@optional.sh index 2fd29a0800..318b778e5e 100644 --- a/test/scenarios-bootc/periodics/el100-src@optional.sh +++ b/test/scenarios-bootc/periodics/el102-src@optional.sh @@ -14,9 +14,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 rhel100-bootc-source-optionals + LVM_SYSROOT_SIZE=20480 prepare_kickstart host1 kickstart-bootc.ks.template rhel102-bootc-source-optionals # Three nics - one for sriov, one for macvlan, another for ipvlan (they cannot enslave the same interface) - launch_vm --boot_blueprint rhel100-bootc --network "${networks}" --vm_disksize 25 + launch_vm --boot_blueprint rhel102-bootc --network "${networks}" --vm_disksize 25 } scenario_remove_vms() { diff --git a/test/scenarios-bootc/periodics/el100-src@standard-suite1.sh b/test/scenarios-bootc/periodics/el102-src@standard-suite1.sh similarity index 72% rename from test/scenarios-bootc/periodics/el100-src@standard-suite1.sh rename to test/scenarios-bootc/periodics/el102-src@standard-suite1.sh index c44327f811..21f24f5664 100644 --- a/test/scenarios-bootc/periodics/el100-src@standard-suite1.sh +++ b/test/scenarios-bootc/periodics/el102-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 rhel100-bootc-source - launch_vm --boot_blueprint rhel100-bootc + prepare_kickstart host1 kickstart-bootc.ks.template rhel102-bootc-source + launch_vm --boot_blueprint rhel102-bootc } scenario_remove_vms() { diff --git a/test/scenarios-bootc/periodics/el100-src@standard-suite2.sh b/test/scenarios-bootc/periodics/el102-src@standard-suite2.sh similarity index 67% rename from test/scenarios-bootc/periodics/el100-src@standard-suite2.sh rename to test/scenarios-bootc/periodics/el102-src@standard-suite2.sh index f484aaafd2..5a26f2207c 100644 --- a/test/scenarios-bootc/periodics/el100-src@standard-suite2.sh +++ b/test/scenarios-bootc/periodics/el102-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 rhel100-bootc-source - launch_vm --boot_blueprint rhel100-bootc + prepare_kickstart host1 kickstart-bootc.ks.template rhel102-bootc-source + launch_vm --boot_blueprint rhel102-bootc } scenario_remove_vms() { diff --git a/test/scenarios-bootc/periodics/el96-yminus2@el100-src@upgrade-ostree2bootc-ok.sh b/test/scenarios-bootc/periodics/el96-yminus2@el102-src@upgrade-ostree2bootc-ok.sh similarity index 90% rename from test/scenarios-bootc/periodics/el96-yminus2@el100-src@upgrade-ostree2bootc-ok.sh rename to test/scenarios-bootc/periodics/el96-yminus2@el102-src@upgrade-ostree2bootc-ok.sh index 6bbb62ae18..5868baf4b7 100644 --- a/test/scenarios-bootc/periodics/el96-yminus2@el100-src@upgrade-ostree2bootc-ok.sh +++ b/test/scenarios-bootc/periodics/el96-yminus2@el102-src@upgrade-ostree2bootc-ok.sh @@ -15,7 +15,7 @@ scenario_remove_vms() { scenario_run_tests() { run_tests host1 \ - --variable "TARGET_REF:rhel100-bootc-source" \ + --variable "TARGET_REF:rhel102-bootc-source" \ --variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \ suites/upgrade/upgrade-successful.robot } diff --git a/test/scenarios-bootc/presubmits/el96-prel@el100-src@upgrade-ok.sh b/test/scenarios-bootc/presubmits/el96-prel@el102-src@upgrade-ok.sh similarity index 91% rename from test/scenarios-bootc/presubmits/el96-prel@el100-src@upgrade-ok.sh rename to test/scenarios-bootc/presubmits/el96-prel@el102-src@upgrade-ok.sh index 152f589b27..0a62c8afd6 100644 --- a/test/scenarios-bootc/presubmits/el96-prel@el100-src@upgrade-ok.sh +++ b/test/scenarios-bootc/presubmits/el96-prel@el102-src@upgrade-ok.sh @@ -21,7 +21,7 @@ scenario_run_tests() { exit_if_image_not_found "${start_image}" run_tests host1 \ - --variable "TARGET_REF:rhel100-bootc-source" \ + --variable "TARGET_REF:rhel102-bootc-source" \ --variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \ suites/upgrade/upgrade-successful.robot } diff --git a/test/scenarios-bootc/presubmits/el96-yminus2@el100-src@upgrade-ok.sh b/test/scenarios-bootc/presubmits/el96-yminus2@el102-src@upgrade-ok.sh similarity index 88% rename from test/scenarios-bootc/presubmits/el96-yminus2@el100-src@upgrade-ok.sh rename to test/scenarios-bootc/presubmits/el96-yminus2@el102-src@upgrade-ok.sh index 922b10ccb2..4c5f3a3c06 100644 --- a/test/scenarios-bootc/presubmits/el96-yminus2@el100-src@upgrade-ok.sh +++ b/test/scenarios-bootc/presubmits/el96-yminus2@el102-src@upgrade-ok.sh @@ -13,7 +13,7 @@ scenario_remove_vms() { scenario_run_tests() { run_tests host1 \ - --variable "TARGET_REF:rhel100-bootc-source" \ + --variable "TARGET_REF:rhel102-bootc-source" \ --variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \ suites/upgrade/upgrade-successful.robot } diff --git a/test/scenarios-bootc/releases/el100-lrel@ginkgo-tests.sh b/test/scenarios-bootc/releases/el102-lrel@ginkgo-tests.sh similarity index 87% rename from test/scenarios-bootc/releases/el100-lrel@ginkgo-tests.sh rename to test/scenarios-bootc/releases/el102-lrel@ginkgo-tests.sh index 24f0c33b8f..26dca5ee88 100644 --- a/test/scenarios-bootc/releases/el100-lrel@ginkgo-tests.sh +++ b/test/scenarios-bootc/releases/el102-lrel@ginkgo-tests.sh @@ -2,7 +2,7 @@ # Sourced from scenario.sh and uses functions defined there. -start_image="rhel100-bootc-brew-lrel-optional" +start_image="rhel102-bootc-brew-lrel-optional" scenario_create_vms() { if ! does_image_exist "${start_image}"; then @@ -11,7 +11,7 @@ scenario_create_vms() { fi prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}" - launch_vm --boot_blueprint rhel100-bootc --vm_disksize 30 --vm_vcpus 4 + launch_vm --boot_blueprint rhel102-bootc --vm_disksize 30 --vm_vcpus 4 } scenario_remove_vms() { diff --git a/test/scenarios-bootc/releases/el100-lrel@optional.sh b/test/scenarios-bootc/releases/el102-lrel@optional.sh similarity index 93% rename from test/scenarios-bootc/releases/el100-lrel@optional.sh rename to test/scenarios-bootc/releases/el102-lrel@optional.sh index 09c344ba60..27c326196f 100644 --- a/test/scenarios-bootc/releases/el100-lrel@optional.sh +++ b/test/scenarios-bootc/releases/el102-lrel@optional.sh @@ -7,7 +7,7 @@ VM_BRIDGE_IP="$(get_vm_bridge_ip "${VM_MULTUS_NETWORK}")" # shellcheck disable=SC2034 # used elsewhere WEB_SERVER_URL="http://${VM_BRIDGE_IP}:${WEB_SERVER_PORT}" -start_image="rhel100-bootc-brew-lrel-optional" +start_image="rhel102-bootc-brew-lrel-optional" scenario_create_vms() { exit_if_image_not_found "${start_image}" @@ -21,7 +21,7 @@ scenario_create_vms() { LVM_SYSROOT_SIZE=20480 prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}" # Three nics - one for sriov, one for macvlan, another for ipvlan (they cannot enslave the same interface) - launch_vm --boot_blueprint rhel100-bootc --network "${networks}" --vm_disksize 25 --vm_vcpus 4 + launch_vm --boot_blueprint rhel102-bootc --network "${networks}" --vm_disksize 25 --vm_vcpus 4 } scenario_remove_vms() { diff --git a/test/scenarios-bootc/releases/el100-lrel@standard1.sh b/test/scenarios-bootc/releases/el102-lrel@standard1.sh similarity index 82% rename from test/scenarios-bootc/releases/el100-lrel@standard1.sh rename to test/scenarios-bootc/releases/el102-lrel@standard1.sh index a113615d04..2003937597 100644 --- a/test/scenarios-bootc/releases/el100-lrel@standard1.sh +++ b/test/scenarios-bootc/releases/el102-lrel@standard1.sh @@ -2,7 +2,7 @@ # Sourced from scenario.sh and uses functions defined there. -start_image="rhel100-bootc-brew-lrel-optional" +start_image="rhel102-bootc-brew-lrel-optional" scenario_create_vms() { if ! does_image_exist "${start_image}"; then @@ -11,7 +11,7 @@ scenario_create_vms() { fi prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}" - launch_vm --boot_blueprint rhel100-bootc --vm_vcpus 4 + launch_vm --boot_blueprint rhel102-bootc --vm_vcpus 4 } scenario_remove_vms() { @@ -30,6 +30,6 @@ scenario_run_tests() { fi run_tests host1 \ - --variable "EXPECTED_OS_VERSION:10.0" \ + --variable "EXPECTED_OS_VERSION:10.2" \ suites/standard1/ } diff --git a/test/scenarios-bootc/releases/el100-lrel@standard2.sh b/test/scenarios-bootc/releases/el102-lrel@standard2.sh similarity index 86% rename from test/scenarios-bootc/releases/el100-lrel@standard2.sh rename to test/scenarios-bootc/releases/el102-lrel@standard2.sh index 7c797f8f42..9186ffbea7 100644 --- a/test/scenarios-bootc/releases/el100-lrel@standard2.sh +++ b/test/scenarios-bootc/releases/el102-lrel@standard2.sh @@ -2,7 +2,7 @@ # Sourced from scenario.sh and uses functions defined there. -start_image="rhel100-bootc-brew-lrel-optional" +start_image="rhel102-bootc-brew-lrel-optional" scenario_create_vms() { if ! does_image_exist "${start_image}"; then @@ -11,7 +11,7 @@ scenario_create_vms() { fi prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}" - launch_vm --boot_blueprint rhel100-bootc --vm_vcpus 4 + launch_vm --boot_blueprint rhel102-bootc --vm_vcpus 4 } scenario_remove_vms() { From def8c98d3ad1af526e78746bb27891de8e5eacf9 Mon Sep 17 00:00:00 2001 From: vanhalenar Date: Wed, 18 Feb 2026 11:37:50 +0000 Subject: [PATCH 02/19] Bump 10.0 bootc blueprints to 10.2 --- .../group1/rhel100-test-agent.containerfile | 22 ------------------- .../group2/rhel100-bootc.image-bootc | 1 - ...rhel102-bootc-crel-isolated.containerfile} | 2 +- ...hel102-bootc-crel-optionals.containerfile} | 2 +- ...rfile => rhel102-bootc-crel.containerfile} | 2 +- ...ile => rhel102-bootc-source.containerfile} | 2 +- ...l102-bootc-source-optionals.containerfile} | 2 +- ...02-bootc-brew-lrel-optional.containerfile} | 2 +- ...rfile => rhel102-bootc-brew.containerfile} | 2 +- 9 files changed, 7 insertions(+), 30 deletions(-) delete mode 100644 test/image-blueprints-bootc/layer1-base/group1/rhel100-test-agent.containerfile delete mode 100644 test/image-blueprints-bootc/layer1-base/group2/rhel100-bootc.image-bootc rename test/image-blueprints-bootc/layer1-base/group2/{rhel100-bootc-crel-isolated.containerfile => rhel102-bootc-crel-isolated.containerfile} (98%) rename test/image-blueprints-bootc/layer1-base/group2/{rhel100-bootc-crel-optionals.containerfile => rhel102-bootc-crel-optionals.containerfile} (97%) rename test/image-blueprints-bootc/layer1-base/group2/{rhel100-bootc-crel.containerfile => rhel102-bootc-crel.containerfile} (97%) rename test/image-blueprints-bootc/layer2-presubmit/group1/{rhel100-bootc-source.containerfile => rhel102-bootc-source.containerfile} (98%) rename test/image-blueprints-bootc/layer2-presubmit/group2/{rhel100-bootc-source-optionals.containerfile => rhel102-bootc-source-optionals.containerfile} (96%) rename test/image-blueprints-bootc/layer4-release/group1/{rhel100-bootc-brew-lrel-optional.containerfile => rhel102-bootc-brew-lrel-optional.containerfile} (98%) rename test/image-blueprints-bootc/layer4-release/group1/{rhel100-bootc-brew.containerfile => rhel102-bootc-brew.containerfile} (97%) diff --git a/test/image-blueprints-bootc/layer1-base/group1/rhel100-test-agent.containerfile b/test/image-blueprints-bootc/layer1-base/group1/rhel100-test-agent.containerfile deleted file mode 100644 index 975ffe0c58..0000000000 --- a/test/image-blueprints-bootc/layer1-base/group1/rhel100-test-agent.containerfile +++ /dev/null @@ -1,22 +0,0 @@ -FROM registry.redhat.io/rhel10/rhel-bootc:10.0 - -# Build arguments -ARG USHIFT_RPM_REPO_NAME=microshift-local -ARG USHIFT_RPM_REPO_PATH=/tmp/$USHIFT_RPM_REPO_NAME - -# Configure the RPM repositories (without EUS enabled) -COPY --chmod=755 ./bootc-images/rpm-repo-config.sh /tmp/rpm-repo-config.sh -RUN /tmp/rpm-repo-config.sh && rm -f /tmp/rpm-repo-config.sh - -# Copy the MicroShift repository contents -COPY ./rpm-repos/$USHIFT_RPM_REPO_NAME $USHIFT_RPM_REPO_PATH - -# Copy repository configuration -COPY ./bootc-images/$USHIFT_RPM_REPO_NAME.repo /etc/yum.repos.d/ - -# Install the test agent and cleanup -RUN dnf install -y microshift-test-agent && \ - systemctl enable microshift-test-agent && \ - rm -vf /etc/yum.repos.d/microshift-*.repo && \ - rm -rvf $USHIFT_RPM_REPO_PATH && \ - dnf clean all diff --git a/test/image-blueprints-bootc/layer1-base/group2/rhel100-bootc.image-bootc b/test/image-blueprints-bootc/layer1-base/group2/rhel100-bootc.image-bootc deleted file mode 100644 index 942d2ffdc5..0000000000 --- a/test/image-blueprints-bootc/layer1-base/group2/rhel100-bootc.image-bootc +++ /dev/null @@ -1 +0,0 @@ -registry.redhat.io/rhel10/rhel-bootc:10.0 \ No newline at end of file diff --git a/test/image-blueprints-bootc/layer1-base/group2/rhel100-bootc-crel-isolated.containerfile b/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel-isolated.containerfile similarity index 98% rename from test/image-blueprints-bootc/layer1-base/group2/rhel100-bootc-crel-isolated.containerfile rename to test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel-isolated.containerfile index 52d7011c25..b11531e7ef 100644 --- a/test/image-blueprints-bootc/layer1-base/group2/rhel100-bootc-crel-isolated.containerfile +++ b/test/image-blueprints-bootc/layer1-base/group2/rhel102-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/rhel100-test-agent:latest +FROM localhost/rhel102-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/rhel100-bootc-crel-optionals.containerfile b/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel-optionals.containerfile similarity index 97% rename from test/image-blueprints-bootc/layer1-base/group2/rhel100-bootc-crel-optionals.containerfile rename to test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel-optionals.containerfile index 4ec4a560c6..82784af5c1 100644 --- a/test/image-blueprints-bootc/layer1-base/group2/rhel100-bootc-crel-optionals.containerfile +++ b/test/image-blueprints-bootc/layer1-base/group2/rhel102-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/rhel100-test-agent:latest +FROM localhost/rhel102-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/rhel100-bootc-crel.containerfile b/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel.containerfile similarity index 97% rename from test/image-blueprints-bootc/layer1-base/group2/rhel100-bootc-crel.containerfile rename to test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel.containerfile index db6f4f9877..f6296561db 100644 --- a/test/image-blueprints-bootc/layer1-base/group2/rhel100-bootc-crel.containerfile +++ b/test/image-blueprints-bootc/layer1-base/group2/rhel102-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/rhel100-test-agent:latest +FROM localhost/rhel102-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/layer2-presubmit/group1/rhel100-bootc-source.containerfile b/test/image-blueprints-bootc/layer2-presubmit/group1/rhel102-bootc-source.containerfile similarity index 98% rename from test/image-blueprints-bootc/layer2-presubmit/group1/rhel100-bootc-source.containerfile rename to test/image-blueprints-bootc/layer2-presubmit/group1/rhel102-bootc-source.containerfile index 0d582ee64a..b846b1a971 100644 --- a/test/image-blueprints-bootc/layer2-presubmit/group1/rhel100-bootc-source.containerfile +++ b/test/image-blueprints-bootc/layer2-presubmit/group1/rhel102-bootc-source.containerfile @@ -1,4 +1,4 @@ -FROM localhost/rhel100-test-agent:latest +FROM localhost/rhel102-test-agent:latest # Build arguments ARG USHIFT_RPM_REPO_NAME=microshift-local diff --git a/test/image-blueprints-bootc/layer2-presubmit/group2/rhel100-bootc-source-optionals.containerfile b/test/image-blueprints-bootc/layer2-presubmit/group2/rhel102-bootc-source-optionals.containerfile similarity index 96% rename from test/image-blueprints-bootc/layer2-presubmit/group2/rhel100-bootc-source-optionals.containerfile rename to test/image-blueprints-bootc/layer2-presubmit/group2/rhel102-bootc-source-optionals.containerfile index 289a385bb6..a860dbb214 100644 --- a/test/image-blueprints-bootc/layer2-presubmit/group2/rhel100-bootc-source-optionals.containerfile +++ b/test/image-blueprints-bootc/layer2-presubmit/group2/rhel102-bootc-source-optionals.containerfile @@ -1,4 +1,4 @@ -FROM localhost/rhel100-bootc-source:latest +FROM localhost/rhel102-bootc-source:latest # Build arguments ARG USHIFT_RPM_REPO_NAME=microshift-local diff --git a/test/image-blueprints-bootc/layer4-release/group1/rhel100-bootc-brew-lrel-optional.containerfile b/test/image-blueprints-bootc/layer4-release/group1/rhel102-bootc-brew-lrel-optional.containerfile similarity index 98% rename from test/image-blueprints-bootc/layer4-release/group1/rhel100-bootc-brew-lrel-optional.containerfile rename to test/image-blueprints-bootc/layer4-release/group1/rhel102-bootc-brew-lrel-optional.containerfile index f23a625730..5d6cf5ff5d 100644 --- a/test/image-blueprints-bootc/layer4-release/group1/rhel100-bootc-brew-lrel-optional.containerfile +++ b/test/image-blueprints-bootc/layer4-release/group1/rhel102-bootc-brew-lrel-optional.containerfile @@ -1,6 +1,6 @@ # {{- if env.Getenv "BREW_LREL_RELEASE_VERSION" "" -}} # Note: This comment makes templating add a new line before the code -FROM localhost/rhel100-test-agent:latest +FROM localhost/rhel102-test-agent:latest # Build arguments ARG USHIFT_RPM_REPO_NAME=microshift-brew diff --git a/test/image-blueprints-bootc/layer4-release/group1/rhel100-bootc-brew.containerfile b/test/image-blueprints-bootc/layer4-release/group1/rhel102-bootc-brew.containerfile similarity index 97% rename from test/image-blueprints-bootc/layer4-release/group1/rhel100-bootc-brew.containerfile rename to test/image-blueprints-bootc/layer4-release/group1/rhel102-bootc-brew.containerfile index b4b9a263a1..7de56bd797 100644 --- a/test/image-blueprints-bootc/layer4-release/group1/rhel100-bootc-brew.containerfile +++ b/test/image-blueprints-bootc/layer4-release/group1/rhel102-bootc-brew.containerfile @@ -1,6 +1,6 @@ # {{- if env.Getenv "BREW_VERSION" "" -}} # Note: This comment makes templating add a new line before the code -FROM localhost/rhel100-test-agent:latest +FROM localhost/rhel102-test-agent:latest # Build arguments ARG USHIFT_RPM_REPO_NAME=microshift-brew From 8fe0d6ea885d830bf33053c83a7179cd4d59de00 Mon Sep 17 00:00:00 2001 From: vanhalenar Date: Fri, 20 Feb 2026 12:52:14 +0000 Subject: [PATCH 03/19] Fix expected os ver --- test/scenarios-bootc/periodics/el102-src@standard-suite1.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/scenarios-bootc/periodics/el102-src@standard-suite1.sh b/test/scenarios-bootc/periodics/el102-src@standard-suite1.sh index 21f24f5664..1f4231a5f1 100644 --- a/test/scenarios-bootc/periodics/el102-src@standard-suite1.sh +++ b/test/scenarios-bootc/periodics/el102-src@standard-suite1.sh @@ -13,6 +13,6 @@ scenario_remove_vms() { scenario_run_tests() { run_tests host1 \ - --variable "EXPECTED_OS_VERSION:10.0" \ + --variable "EXPECTED_OS_VERSION:10.2" \ suites/standard1/ } From 0749a20693c7c21a2ac0399f9a438ca0f5ff7173 Mon Sep 17 00:00:00 2001 From: vanhalenar Date: Fri, 20 Feb 2026 12:55:42 +0000 Subject: [PATCH 04/19] Bump missed upgrade test --- ...otc-ok.sh => el96-prel@el102-src@upgrade-ostree2bootc-ok.sh} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename test/scenarios-bootc/periodics/{el96-prel@el100-src@upgrade-ostree2bootc-ok.sh => el96-prel@el102-src@upgrade-ostree2bootc-ok.sh} (90%) diff --git a/test/scenarios-bootc/periodics/el96-prel@el100-src@upgrade-ostree2bootc-ok.sh b/test/scenarios-bootc/periodics/el96-prel@el102-src@upgrade-ostree2bootc-ok.sh similarity index 90% rename from test/scenarios-bootc/periodics/el96-prel@el100-src@upgrade-ostree2bootc-ok.sh rename to test/scenarios-bootc/periodics/el96-prel@el102-src@upgrade-ostree2bootc-ok.sh index cadbab5a64..4dd9098206 100644 --- a/test/scenarios-bootc/periodics/el96-prel@el100-src@upgrade-ostree2bootc-ok.sh +++ b/test/scenarios-bootc/periodics/el96-prel@el102-src@upgrade-ostree2bootc-ok.sh @@ -15,7 +15,7 @@ scenario_remove_vms() { scenario_run_tests() { run_tests host1 \ - --variable "TARGET_REF:rhel100-bootc-source" \ + --variable "TARGET_REF:rhel102-bootc-source" \ --variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \ suites/upgrade/upgrade-successful.robot } From d577f639514f11feb7da50e207730a248cf9bab0 Mon Sep 17 00:00:00 2001 From: vanhalenar Date: Mon, 23 Feb 2026 12:23:43 +0000 Subject: [PATCH 05/19] Add early kernel repo --- test/package-sources-bootc/rhel102-mirror.repo | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/package-sources-bootc/rhel102-mirror.repo b/test/package-sources-bootc/rhel102-mirror.repo index 68067635f5..d5b1bd25b8 100644 --- a/test/package-sources-bootc/rhel102-mirror.repo +++ b/test/package-sources-bootc/rhel102-mirror.repo @@ -14,3 +14,11 @@ enabled = 1 sslverify = false gpgcheck = 0 skip_if_unavailable = false + +[rhel-10.2-early-kernel] +name = rhel-10.2-early-kernel +baseurl = http://localhost:{{ .Env.WEB_SERVER_PORT }}/ocp-mirror/reposync/4.22{{ if eq .Env.UNAME_M "aarch64" }}_aarch64{{ end }}/rhel-102-early-kernel +enabled = 1 +sslverify = false +gpgcheck = 0 +skip_if_unavailable = false From 636bf6f44aabf4e43dbc2670e893f2574f76fd1d Mon Sep 17 00:00:00 2001 From: vanhalenar Date: Wed, 25 Feb 2026 09:28:06 +0000 Subject: [PATCH 06/19] Add missing test --- .../el96-src@el102-src@upgrade-ok.sh | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 test/scenarios-bootc/presubmits/el96-src@el102-src@upgrade-ok.sh diff --git a/test/scenarios-bootc/presubmits/el96-src@el102-src@upgrade-ok.sh b/test/scenarios-bootc/presubmits/el96-src@el102-src@upgrade-ok.sh new file mode 100644 index 0000000000..4c5f3a3c06 --- /dev/null +++ b/test/scenarios-bootc/presubmits/el96-src@el102-src@upgrade-ok.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +# Sourced from scenario.sh and uses functions defined there. + +scenario_create_vms() { + prepare_kickstart host1 kickstart-bootc.ks.template rhel96-bootc-yminus2 + launch_vm --boot_blueprint rhel96-bootc +} + +scenario_remove_vms() { + remove_vm host1 +} + +scenario_run_tests() { + run_tests host1 \ + --variable "TARGET_REF:rhel102-bootc-source" \ + --variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \ + suites/upgrade/upgrade-successful.robot +} From 02b84b2efb1c6564377142bb986eb3edf5124ec4 Mon Sep 17 00:00:00 2001 From: vanhalenar Date: Wed, 25 Feb 2026 09:51:18 +0000 Subject: [PATCH 07/19] Fix upgrade test target ref, skip generic device plugin test --- .../group2/rhel98-bootc-source-optionals.containerfile | 5 +++-- test/scenarios-bootc/periodics/el102-src@optional.sh | 2 ++ ...00-src@upgrade-ok.sh => el98-src@el102-src@upgrade-ok.sh} | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) rename test/scenarios-bootc/presubmits/{el98-src@el100-src@upgrade-ok.sh => el98-src@el102-src@upgrade-ok.sh} (88%) diff --git a/test/image-blueprints-bootc/layer2-presubmit/group2/rhel98-bootc-source-optionals.containerfile b/test/image-blueprints-bootc/layer2-presubmit/group2/rhel98-bootc-source-optionals.containerfile index b7f1866590..1156c25c2f 100644 --- a/test/image-blueprints-bootc/layer2-presubmit/group2/rhel98-bootc-source-optionals.containerfile +++ b/test/image-blueprints-bootc/layer2-presubmit/group2/rhel98-bootc-source-optionals.containerfile @@ -29,5 +29,6 @@ RUN dnf repoinfo --enabled && \ dnf clean all # Prepare system for testing Generic Device Plugin -COPY --chmod=755 ./bootc-images/build-serialsim.sh /tmp/build-serialsim.sh -RUN /tmp/build-serialsim.sh && rm -f /tmp/build-serialsim.sh +# Temporarily disable until we can get the kernel-devel package +# COPY --chmod=755 ./bootc-images/build-serialsim.sh /tmp/build-serialsim.sh +# RUN /tmp/build-serialsim.sh && rm -f /tmp/build-serialsim.sh diff --git a/test/scenarios-bootc/periodics/el102-src@optional.sh b/test/scenarios-bootc/periodics/el102-src@optional.sh index 318b778e5e..3385a45152 100644 --- a/test/scenarios-bootc/periodics/el102-src@optional.sh +++ b/test/scenarios-bootc/periodics/el102-src@optional.sh @@ -29,6 +29,8 @@ scenario_run_tests() { if [[ "${UNAME_M}" =~ aarch64 ]]; then skip_args="--skip sriov" fi + # Skip generic device plugin on RHEL 10 until we can get the correct kernel-devel package. + skip_args+=" --skip generic-device-plugin" # shellcheck disable=SC2086 run_tests host1 \ --variable "PROMETHEUS_HOST:$(hostname)" \ diff --git a/test/scenarios-bootc/presubmits/el98-src@el100-src@upgrade-ok.sh b/test/scenarios-bootc/presubmits/el98-src@el102-src@upgrade-ok.sh similarity index 88% rename from test/scenarios-bootc/presubmits/el98-src@el100-src@upgrade-ok.sh rename to test/scenarios-bootc/presubmits/el98-src@el102-src@upgrade-ok.sh index e8ea1f391d..7084d8fa86 100644 --- a/test/scenarios-bootc/presubmits/el98-src@el100-src@upgrade-ok.sh +++ b/test/scenarios-bootc/presubmits/el98-src@el102-src@upgrade-ok.sh @@ -13,7 +13,7 @@ scenario_remove_vms() { scenario_run_tests() { run_tests host1 \ - --variable "TARGET_REF:rhel100-bootc-source" \ + --variable "TARGET_REF:rhel102-bootc-source" \ --variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \ suites/upgrade/upgrade-successful.robot } From 7bc9d22ac3c38b6f4ce2cf2810f4654f6abb783d Mon Sep 17 00:00:00 2001 From: vanhalenar Date: Wed, 25 Feb 2026 09:54:27 +0000 Subject: [PATCH 08/19] Delete extra scenario --- .../el96-src@el102-src@upgrade-ok.sh | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 test/scenarios-bootc/presubmits/el96-src@el102-src@upgrade-ok.sh diff --git a/test/scenarios-bootc/presubmits/el96-src@el102-src@upgrade-ok.sh b/test/scenarios-bootc/presubmits/el96-src@el102-src@upgrade-ok.sh deleted file mode 100644 index 4c5f3a3c06..0000000000 --- a/test/scenarios-bootc/presubmits/el96-src@el102-src@upgrade-ok.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -# Sourced from scenario.sh and uses functions defined there. - -scenario_create_vms() { - prepare_kickstart host1 kickstart-bootc.ks.template rhel96-bootc-yminus2 - launch_vm --boot_blueprint rhel96-bootc -} - -scenario_remove_vms() { - remove_vm host1 -} - -scenario_run_tests() { - run_tests host1 \ - --variable "TARGET_REF:rhel102-bootc-source" \ - --variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \ - suites/upgrade/upgrade-successful.robot -} From c0fc46b2ec97d6e15df349dc91d0df384b99ceb0 Mon Sep 17 00:00:00 2001 From: vanhalenar Date: Wed, 25 Feb 2026 10:08:06 +0000 Subject: [PATCH 09/19] Skip generic device plugin in release tests --- .../group1/rhel102-bootc-brew-lrel-optional.containerfile | 5 +++-- test/scenarios-bootc/releases/el102-lrel@optional.sh | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/test/image-blueprints-bootc/layer4-release/group1/rhel102-bootc-brew-lrel-optional.containerfile b/test/image-blueprints-bootc/layer4-release/group1/rhel102-bootc-brew-lrel-optional.containerfile index 5d6cf5ff5d..ac9d4de84c 100644 --- a/test/image-blueprints-bootc/layer4-release/group1/rhel102-bootc-brew-lrel-optional.containerfile +++ b/test/image-blueprints-bootc/layer4-release/group1/rhel102-bootc-brew-lrel-optional.containerfile @@ -50,6 +50,7 @@ RUN firewall-offline-cmd --zone=public --add-port=22/tcp && \ firewall-offline-cmd --zone=public --add-port=30000-32767/udp # Prepare system for testing Generic Device Plugin -COPY --chmod=755 ./bootc-images/build-serialsim.sh /tmp/build-serialsim.sh -RUN /tmp/build-serialsim.sh && rm -f /tmp/build-serialsim.sh +# Temporarily disable until we can get the kernel-devel package +# COPY --chmod=755 ./bootc-images/build-serialsim.sh /tmp/build-serialsim.sh +# RUN /tmp/build-serialsim.sh && rm -f /tmp/build-serialsim.sh # {{- end -}} diff --git a/test/scenarios-bootc/releases/el102-lrel@optional.sh b/test/scenarios-bootc/releases/el102-lrel@optional.sh index 27c326196f..b24c208eb2 100644 --- a/test/scenarios-bootc/releases/el102-lrel@optional.sh +++ b/test/scenarios-bootc/releases/el102-lrel@optional.sh @@ -38,6 +38,8 @@ scenario_run_tests() { if [[ "${UNAME_M}" =~ aarch64 ]]; then skip_args="--skip sriov" fi + # Skip generic device plugin on RHEL 10 until we can get the correct kernel-devel package. + skip_args+=" --skip generic-device-plugin" # shellcheck disable=SC2086 run_tests host1 \ --variable "PROMETHEUS_HOST:$(hostname)" \ From 07bf2285b9f0e3a238751e73b4be371ad7038877 Mon Sep 17 00:00:00 2001 From: vanhalenar Date: Wed, 25 Feb 2026 11:11:55 +0000 Subject: [PATCH 10/19] Add Fast datapath repo for RHEL 10 --- .../group2/rhel102-bootc-crel-isolated.containerfile | 2 +- .../group2/rhel102-bootc-crel-optionals.containerfile | 2 +- .../group2/rhel102-bootc-crel.containerfile | 2 +- .../group1/rhel102-bootc-source.containerfile | 2 +- .../rhel102-bootc-source-optionals.containerfile | 2 +- .../microshift-fast-datapath-rhel10.repo | 11 +++++++++++ 6 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 test/package-sources-bootc/microshift-fast-datapath-rhel10.repo diff --git a/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel-isolated.containerfile b/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel-isolated.containerfile index b11531e7ef..c45225e617 100644 --- a/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel-isolated.containerfile +++ b/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel-isolated.containerfile @@ -3,7 +3,7 @@ FROM localhost/rhel102-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 \ +COPY ./bootc-images/microshift-fast-datapath-rhel10.repo ./bootc-images/microshift-crel.repo ./bootc-images/microshift-rhocp-y.repo \ /etc/yum.repos.d/ # Print repository configuration contents. diff --git a/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel-optionals.containerfile b/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel-optionals.containerfile index 82784af5c1..edd113f5fa 100644 --- a/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel-optionals.containerfile +++ b/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel-optionals.containerfile @@ -3,7 +3,7 @@ FROM localhost/rhel102-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 \ +COPY ./bootc-images/microshift-fast-datapath-rhel10.repo ./bootc-images/microshift-crel.repo ./bootc-images/microshift-rhocp-y.repo \ /etc/yum.repos.d/ # Print repository configuration contents. diff --git a/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel.containerfile b/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel.containerfile index f6296561db..55a898bddf 100644 --- a/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel.containerfile +++ b/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel.containerfile @@ -3,7 +3,7 @@ FROM localhost/rhel102-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 \ +COPY ./bootc-images/microshift-fast-datapath-rhel10.repo ./bootc-images/microshift-crel.repo ./bootc-images/microshift-rhocp-y.repo \ /etc/yum.repos.d/ # Print repository configuration contents. diff --git a/test/image-blueprints-bootc/layer2-presubmit/group1/rhel102-bootc-source.containerfile b/test/image-blueprints-bootc/layer2-presubmit/group1/rhel102-bootc-source.containerfile index b846b1a971..31bd43aaaf 100644 --- a/test/image-blueprints-bootc/layer2-presubmit/group1/rhel102-bootc-source.containerfile +++ b/test/image-blueprints-bootc/layer2-presubmit/group1/rhel102-bootc-source.containerfile @@ -8,7 +8,7 @@ ARG USHIFT_RPM_REPO_PATH=/tmp/$USHIFT_RPM_REPO_NAME COPY ./rpm-repos/$USHIFT_RPM_REPO_NAME $USHIFT_RPM_REPO_PATH # Copy repository configuration -COPY ./bootc-images/$USHIFT_RPM_REPO_NAME.repo ./bootc-images/microshift-fast-datapath-rhel9.repo ./bootc-images/microshift-rhocp-y.repo \ +COPY ./bootc-images/$USHIFT_RPM_REPO_NAME.repo ./bootc-images/microshift-fast-datapath-rhel10.repo ./bootc-images/microshift-rhocp-y.repo \ /etc/yum.repos.d/ # Print repository configuration contents. diff --git a/test/image-blueprints-bootc/layer2-presubmit/group2/rhel102-bootc-source-optionals.containerfile b/test/image-blueprints-bootc/layer2-presubmit/group2/rhel102-bootc-source-optionals.containerfile index a860dbb214..db9f431949 100644 --- a/test/image-blueprints-bootc/layer2-presubmit/group2/rhel102-bootc-source-optionals.containerfile +++ b/test/image-blueprints-bootc/layer2-presubmit/group2/rhel102-bootc-source-optionals.containerfile @@ -8,7 +8,7 @@ ARG USHIFT_RPM_REPO_PATH=/tmp/$USHIFT_RPM_REPO_NAME COPY ./rpm-repos/$USHIFT_RPM_REPO_NAME $USHIFT_RPM_REPO_PATH # Copy repository configuration -COPY ./bootc-images/$USHIFT_RPM_REPO_NAME.repo ./bootc-images/microshift-fast-datapath-rhel9.repo ./bootc-images/microshift-rhocp-y.repo \ +COPY ./bootc-images/$USHIFT_RPM_REPO_NAME.repo ./bootc-images/microshift-fast-datapath-rhel10.repo ./bootc-images/microshift-rhocp-y.repo \ /etc/yum.repos.d/ # Print repository configuration contents. diff --git a/test/package-sources-bootc/microshift-fast-datapath-rhel10.repo b/test/package-sources-bootc/microshift-fast-datapath-rhel10.repo new file mode 100644 index 0000000000..ea238f8436 --- /dev/null +++ b/test/package-sources-bootc/microshift-fast-datapath-rhel10.repo @@ -0,0 +1,11 @@ +[fast-datapath] +name = Fast Datapath for RHEL 10 +baseurl = https://cdn.redhat.com/content/dist/layered/rhel10/{{ .Env.UNAME_M }}/fast-datapath/os +enabled = 1 +gpgcheck = 1 +gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release +sslverify = 1 +sslcacert = /etc/rhsm/ca/redhat-uep.pem +sslclientkey = {{ .Env.SSL_CLIENT_KEY_FILE }} +sslclientcert = {{ .Env.SSL_CLIENT_CERT_FILE }} +skip_if_unavailable = 0 From 6010d1ca2c63c470ca88e9aac6686c92043bb3ed Mon Sep 17 00:00:00 2001 From: vanhalenar Date: Wed, 25 Feb 2026 13:34:09 +0000 Subject: [PATCH 11/19] Add 4.21 repos to crel images because of crio --- .../group2/rhel102-bootc-crel-optionals.containerfile | 2 +- .../layer1-base/group2/rhel102-bootc-crel.containerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel-optionals.containerfile b/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel-optionals.containerfile index edd113f5fa..552a2e60b1 100644 --- a/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel-optionals.containerfile +++ b/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel-optionals.containerfile @@ -3,7 +3,7 @@ FROM localhost/rhel102-test-agent:latest # Copy repository configuration -COPY ./bootc-images/microshift-fast-datapath-rhel10.repo ./bootc-images/microshift-crel.repo ./bootc-images/microshift-rhocp-y.repo \ +COPY ./bootc-images/microshift-fast-datapath-rhel10.repo ./bootc-images/microshift-crel.repo ./bootc-images/microshift-rhocp-y.repo ./bootc-images/microshift-rhocp-y1.repo \ /etc/yum.repos.d/ # Print repository configuration contents. diff --git a/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel.containerfile b/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel.containerfile index 55a898bddf..4fe9f44ece 100644 --- a/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel.containerfile +++ b/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel.containerfile @@ -3,7 +3,7 @@ FROM localhost/rhel102-test-agent:latest # Copy repository configuration -COPY ./bootc-images/microshift-fast-datapath-rhel10.repo ./bootc-images/microshift-crel.repo ./bootc-images/microshift-rhocp-y.repo \ +COPY ./bootc-images/microshift-fast-datapath-rhel10.repo ./bootc-images/microshift-crel.repo ./bootc-images/microshift-rhocp-y.repo ./bootc-images/microshift-rhocp-y1.repo \ /etc/yum.repos.d/ # Print repository configuration contents. From 372e0ace94bd13133da8f7adecec32200d7ad0a9 Mon Sep 17 00:00:00 2001 From: vanhalenar Date: Wed, 25 Feb 2026 13:42:29 +0000 Subject: [PATCH 12/19] Add 98 -> 102 upgrade test --- .../el98-src@el102-src@upgrade-ok.sh | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 test/scenarios-bootc/periodics/el98-src@el102-src@upgrade-ok.sh diff --git a/test/scenarios-bootc/periodics/el98-src@el102-src@upgrade-ok.sh b/test/scenarios-bootc/periodics/el98-src@el102-src@upgrade-ok.sh new file mode 100644 index 0000000000..7084d8fa86 --- /dev/null +++ b/test/scenarios-bootc/periodics/el98-src@el102-src@upgrade-ok.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +# Sourced from scenario.sh and uses functions defined there. + +scenario_create_vms() { + prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source + launch_vm --boot_blueprint rhel98-bootc +} + +scenario_remove_vms() { + remove_vm host1 +} + +scenario_run_tests() { + run_tests host1 \ + --variable "TARGET_REF:rhel102-bootc-source" \ + --variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \ + suites/upgrade/upgrade-successful.robot +} From f20415e4f5f62fd8009adced89b5bf4091a080e1 Mon Sep 17 00:00:00 2001 From: vanhalenar Date: Wed, 25 Feb 2026 14:17:36 +0000 Subject: [PATCH 13/19] Add rhocp y1 repo to isolated image --- .../group2/rhel102-bootc-crel-isolated.containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel-isolated.containerfile b/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel-isolated.containerfile index c45225e617..ef5c0d4ba4 100644 --- a/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel-isolated.containerfile +++ b/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel-isolated.containerfile @@ -3,7 +3,7 @@ FROM localhost/rhel102-test-agent:latest # Copy repository configuration -COPY ./bootc-images/microshift-fast-datapath-rhel10.repo ./bootc-images/microshift-crel.repo ./bootc-images/microshift-rhocp-y.repo \ +COPY ./bootc-images/microshift-fast-datapath-rhel10.repo ./bootc-images/microshift-crel.repo ./bootc-images/microshift-rhocp-y.repo ./bootc-images/microshift-rhocp-y1.repo \ /etc/yum.repos.d/ # Print repository configuration contents. From a9b02c74af1fe40d3b8799a8ba3984740ce2964b Mon Sep 17 00:00:00 2001 From: vanhalenar Date: Wed, 25 Feb 2026 14:58:26 +0000 Subject: [PATCH 14/19] Skip gdp test in the right containerfile and unskip in the wrong one --- .../group2/rhel102-bootc-source-optionals.containerfile | 5 +++-- .../group2/rhel98-bootc-source-optionals.containerfile | 5 ++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/image-blueprints-bootc/layer2-presubmit/group2/rhel102-bootc-source-optionals.containerfile b/test/image-blueprints-bootc/layer2-presubmit/group2/rhel102-bootc-source-optionals.containerfile index db9f431949..0b6e5fa44c 100644 --- a/test/image-blueprints-bootc/layer2-presubmit/group2/rhel102-bootc-source-optionals.containerfile +++ b/test/image-blueprints-bootc/layer2-presubmit/group2/rhel102-bootc-source-optionals.containerfile @@ -29,5 +29,6 @@ RUN dnf repoinfo --enabled && \ dnf clean all # Prepare system for testing Generic Device Plugin -COPY --chmod=755 ./bootc-images/build-serialsim.sh /tmp/build-serialsim.sh -RUN /tmp/build-serialsim.sh && rm -f /tmp/build-serialsim.sh +# Temporarily disable until we can get the correct kernel-devel package +# COPY --chmod=755 ./bootc-images/build-serialsim.sh /tmp/build-serialsim.sh +# RUN /tmp/build-serialsim.sh && rm -f /tmp/build-serialsim.sh diff --git a/test/image-blueprints-bootc/layer2-presubmit/group2/rhel98-bootc-source-optionals.containerfile b/test/image-blueprints-bootc/layer2-presubmit/group2/rhel98-bootc-source-optionals.containerfile index 1156c25c2f..b7f1866590 100644 --- a/test/image-blueprints-bootc/layer2-presubmit/group2/rhel98-bootc-source-optionals.containerfile +++ b/test/image-blueprints-bootc/layer2-presubmit/group2/rhel98-bootc-source-optionals.containerfile @@ -29,6 +29,5 @@ RUN dnf repoinfo --enabled && \ dnf clean all # Prepare system for testing Generic Device Plugin -# Temporarily disable until we can get the kernel-devel package -# COPY --chmod=755 ./bootc-images/build-serialsim.sh /tmp/build-serialsim.sh -# RUN /tmp/build-serialsim.sh && rm -f /tmp/build-serialsim.sh +COPY --chmod=755 ./bootc-images/build-serialsim.sh /tmp/build-serialsim.sh +RUN /tmp/build-serialsim.sh && rm -f /tmp/build-serialsim.sh From 80a5f12d9d7f9a10ef7ecb05847656c0e457e296 Mon Sep 17 00:00:00 2001 From: vanhalenar Date: Mon, 2 Mar 2026 07:39:15 +0000 Subject: [PATCH 15/19] Restore release tests --- ...l102-lrel@ginkgo-tests.sh => el100-lrel@ginkgo-tests.sh} | 4 ++-- .../{el102-lrel@optional.sh => el100-lrel@optional.sh} | 6 ++---- .../{el102-lrel@standard1.sh => el100-lrel@standard1.sh} | 6 +++--- .../{el102-lrel@standard2.sh => el100-lrel@standard2.sh} | 4 ++-- 4 files changed, 9 insertions(+), 11 deletions(-) rename test/scenarios-bootc/releases/{el102-lrel@ginkgo-tests.sh => el100-lrel@ginkgo-tests.sh} (87%) rename test/scenarios-bootc/releases/{el102-lrel@optional.sh => el100-lrel@optional.sh} (85%) rename test/scenarios-bootc/releases/{el102-lrel@standard1.sh => el100-lrel@standard1.sh} (82%) rename test/scenarios-bootc/releases/{el102-lrel@standard2.sh => el100-lrel@standard2.sh} (86%) diff --git a/test/scenarios-bootc/releases/el102-lrel@ginkgo-tests.sh b/test/scenarios-bootc/releases/el100-lrel@ginkgo-tests.sh similarity index 87% rename from test/scenarios-bootc/releases/el102-lrel@ginkgo-tests.sh rename to test/scenarios-bootc/releases/el100-lrel@ginkgo-tests.sh index 26dca5ee88..24f0c33b8f 100644 --- a/test/scenarios-bootc/releases/el102-lrel@ginkgo-tests.sh +++ b/test/scenarios-bootc/releases/el100-lrel@ginkgo-tests.sh @@ -2,7 +2,7 @@ # Sourced from scenario.sh and uses functions defined there. -start_image="rhel102-bootc-brew-lrel-optional" +start_image="rhel100-bootc-brew-lrel-optional" scenario_create_vms() { if ! does_image_exist "${start_image}"; then @@ -11,7 +11,7 @@ scenario_create_vms() { fi prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}" - launch_vm --boot_blueprint rhel102-bootc --vm_disksize 30 --vm_vcpus 4 + launch_vm --boot_blueprint rhel100-bootc --vm_disksize 30 --vm_vcpus 4 } scenario_remove_vms() { diff --git a/test/scenarios-bootc/releases/el102-lrel@optional.sh b/test/scenarios-bootc/releases/el100-lrel@optional.sh similarity index 85% rename from test/scenarios-bootc/releases/el102-lrel@optional.sh rename to test/scenarios-bootc/releases/el100-lrel@optional.sh index b24c208eb2..09c344ba60 100644 --- a/test/scenarios-bootc/releases/el102-lrel@optional.sh +++ b/test/scenarios-bootc/releases/el100-lrel@optional.sh @@ -7,7 +7,7 @@ VM_BRIDGE_IP="$(get_vm_bridge_ip "${VM_MULTUS_NETWORK}")" # shellcheck disable=SC2034 # used elsewhere WEB_SERVER_URL="http://${VM_BRIDGE_IP}:${WEB_SERVER_PORT}" -start_image="rhel102-bootc-brew-lrel-optional" +start_image="rhel100-bootc-brew-lrel-optional" scenario_create_vms() { exit_if_image_not_found "${start_image}" @@ -21,7 +21,7 @@ scenario_create_vms() { LVM_SYSROOT_SIZE=20480 prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}" # Three nics - one for sriov, one for macvlan, another for ipvlan (they cannot enslave the same interface) - launch_vm --boot_blueprint rhel102-bootc --network "${networks}" --vm_disksize 25 --vm_vcpus 4 + launch_vm --boot_blueprint rhel100-bootc --network "${networks}" --vm_disksize 25 --vm_vcpus 4 } scenario_remove_vms() { @@ -38,8 +38,6 @@ scenario_run_tests() { if [[ "${UNAME_M}" =~ aarch64 ]]; then skip_args="--skip sriov" fi - # Skip generic device plugin on RHEL 10 until we can get the correct kernel-devel package. - skip_args+=" --skip generic-device-plugin" # shellcheck disable=SC2086 run_tests host1 \ --variable "PROMETHEUS_HOST:$(hostname)" \ diff --git a/test/scenarios-bootc/releases/el102-lrel@standard1.sh b/test/scenarios-bootc/releases/el100-lrel@standard1.sh similarity index 82% rename from test/scenarios-bootc/releases/el102-lrel@standard1.sh rename to test/scenarios-bootc/releases/el100-lrel@standard1.sh index 2003937597..a113615d04 100644 --- a/test/scenarios-bootc/releases/el102-lrel@standard1.sh +++ b/test/scenarios-bootc/releases/el100-lrel@standard1.sh @@ -2,7 +2,7 @@ # Sourced from scenario.sh and uses functions defined there. -start_image="rhel102-bootc-brew-lrel-optional" +start_image="rhel100-bootc-brew-lrel-optional" scenario_create_vms() { if ! does_image_exist "${start_image}"; then @@ -11,7 +11,7 @@ scenario_create_vms() { fi prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}" - launch_vm --boot_blueprint rhel102-bootc --vm_vcpus 4 + launch_vm --boot_blueprint rhel100-bootc --vm_vcpus 4 } scenario_remove_vms() { @@ -30,6 +30,6 @@ scenario_run_tests() { fi run_tests host1 \ - --variable "EXPECTED_OS_VERSION:10.2" \ + --variable "EXPECTED_OS_VERSION:10.0" \ suites/standard1/ } diff --git a/test/scenarios-bootc/releases/el102-lrel@standard2.sh b/test/scenarios-bootc/releases/el100-lrel@standard2.sh similarity index 86% rename from test/scenarios-bootc/releases/el102-lrel@standard2.sh rename to test/scenarios-bootc/releases/el100-lrel@standard2.sh index 9186ffbea7..7c797f8f42 100644 --- a/test/scenarios-bootc/releases/el102-lrel@standard2.sh +++ b/test/scenarios-bootc/releases/el100-lrel@standard2.sh @@ -2,7 +2,7 @@ # Sourced from scenario.sh and uses functions defined there. -start_image="rhel102-bootc-brew-lrel-optional" +start_image="rhel100-bootc-brew-lrel-optional" scenario_create_vms() { if ! does_image_exist "${start_image}"; then @@ -11,7 +11,7 @@ scenario_create_vms() { fi prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}" - launch_vm --boot_blueprint rhel102-bootc --vm_vcpus 4 + launch_vm --boot_blueprint rhel100-bootc --vm_vcpus 4 } scenario_remove_vms() { From d586ca87667c37c7ef7d0570f320c97c3982f0f9 Mon Sep 17 00:00:00 2001 From: vanhalenar Date: Mon, 2 Mar 2026 08:07:15 +0000 Subject: [PATCH 16/19] Fix release test name --- ...mages-standard1.sh => el96-crel@published-images-standard1.sh} | 0 ...mages-standard2.sh => el96-crel@published-images-standard2.sh} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename test/scenarios-bootc/releases/{el96-lrel@published-images-standard1.sh => el96-crel@published-images-standard1.sh} (100%) rename test/scenarios-bootc/releases/{el96-lrel@published-images-standard2.sh => el96-crel@published-images-standard2.sh} (100%) diff --git a/test/scenarios-bootc/releases/el96-lrel@published-images-standard1.sh b/test/scenarios-bootc/releases/el96-crel@published-images-standard1.sh similarity index 100% rename from test/scenarios-bootc/releases/el96-lrel@published-images-standard1.sh rename to test/scenarios-bootc/releases/el96-crel@published-images-standard1.sh diff --git a/test/scenarios-bootc/releases/el96-lrel@published-images-standard2.sh b/test/scenarios-bootc/releases/el96-crel@published-images-standard2.sh similarity index 100% rename from test/scenarios-bootc/releases/el96-lrel@published-images-standard2.sh rename to test/scenarios-bootc/releases/el96-crel@published-images-standard2.sh From ae2e68ae99f5fd3b0adac9d059d6ac8c427820f2 Mon Sep 17 00:00:00 2001 From: vanhalenar Date: Mon, 2 Mar 2026 08:10:56 +0000 Subject: [PATCH 17/19] Fix release test again --- ...mages-standard1.sh => el96-lrel@published-images-standard1.sh} | 0 ...mages-standard2.sh => el96-lrel@published-images-standard2.sh} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename test/scenarios-bootc/releases/{el96-crel@published-images-standard1.sh => el96-lrel@published-images-standard1.sh} (100%) rename test/scenarios-bootc/releases/{el96-crel@published-images-standard2.sh => el96-lrel@published-images-standard2.sh} (100%) diff --git a/test/scenarios-bootc/releases/el96-crel@published-images-standard1.sh b/test/scenarios-bootc/releases/el96-lrel@published-images-standard1.sh similarity index 100% rename from test/scenarios-bootc/releases/el96-crel@published-images-standard1.sh rename to test/scenarios-bootc/releases/el96-lrel@published-images-standard1.sh diff --git a/test/scenarios-bootc/releases/el96-crel@published-images-standard2.sh b/test/scenarios-bootc/releases/el96-lrel@published-images-standard2.sh similarity index 100% rename from test/scenarios-bootc/releases/el96-crel@published-images-standard2.sh rename to test/scenarios-bootc/releases/el96-lrel@published-images-standard2.sh From 5e4238255ce333a39ec3552cba2491e025e3a138 Mon Sep 17 00:00:00 2001 From: vanhalenar Date: Mon, 2 Mar 2026 15:24:41 +0000 Subject: [PATCH 18/19] Remove rhel 10 fast datapath repo --- .../group2/rhel102-bootc-crel-isolated.containerfile | 2 +- .../group2/rhel102-bootc-crel-optionals.containerfile | 2 +- .../group2/rhel102-bootc-crel.containerfile | 2 +- .../group1/rhel102-bootc-source.containerfile | 2 +- .../rhel102-bootc-source-optionals.containerfile | 2 +- .../microshift-fast-datapath-rhel10.repo | 11 ----------- 6 files changed, 5 insertions(+), 16 deletions(-) delete mode 100644 test/package-sources-bootc/microshift-fast-datapath-rhel10.repo diff --git a/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel-isolated.containerfile b/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel-isolated.containerfile index ef5c0d4ba4..611d5b6d8f 100644 --- a/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel-isolated.containerfile +++ b/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel-isolated.containerfile @@ -3,7 +3,7 @@ FROM localhost/rhel102-test-agent:latest # Copy repository configuration -COPY ./bootc-images/microshift-fast-datapath-rhel10.repo ./bootc-images/microshift-crel.repo ./bootc-images/microshift-rhocp-y.repo ./bootc-images/microshift-rhocp-y1.repo \ +COPY ./bootc-images/microshift-fast-datapath-rhel9.repo ./bootc-images/microshift-crel.repo ./bootc-images/microshift-rhocp-y.repo ./bootc-images/microshift-rhocp-y1.repo \ /etc/yum.repos.d/ # Print repository configuration contents. diff --git a/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel-optionals.containerfile b/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel-optionals.containerfile index 552a2e60b1..f9fe7f33eb 100644 --- a/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel-optionals.containerfile +++ b/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel-optionals.containerfile @@ -3,7 +3,7 @@ FROM localhost/rhel102-test-agent:latest # Copy repository configuration -COPY ./bootc-images/microshift-fast-datapath-rhel10.repo ./bootc-images/microshift-crel.repo ./bootc-images/microshift-rhocp-y.repo ./bootc-images/microshift-rhocp-y1.repo \ +COPY ./bootc-images/microshift-fast-datapath-rhel9.repo ./bootc-images/microshift-crel.repo ./bootc-images/microshift-rhocp-y.repo ./bootc-images/microshift-rhocp-y1.repo \ /etc/yum.repos.d/ # Print repository configuration contents. diff --git a/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel.containerfile b/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel.containerfile index 4fe9f44ece..ea5772bec2 100644 --- a/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel.containerfile +++ b/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel.containerfile @@ -3,7 +3,7 @@ FROM localhost/rhel102-test-agent:latest # Copy repository configuration -COPY ./bootc-images/microshift-fast-datapath-rhel10.repo ./bootc-images/microshift-crel.repo ./bootc-images/microshift-rhocp-y.repo ./bootc-images/microshift-rhocp-y1.repo \ +COPY ./bootc-images/microshift-fast-datapath-rhel9.repo ./bootc-images/microshift-crel.repo ./bootc-images/microshift-rhocp-y.repo ./bootc-images/microshift-rhocp-y1.repo \ /etc/yum.repos.d/ # Print repository configuration contents. diff --git a/test/image-blueprints-bootc/layer2-presubmit/group1/rhel102-bootc-source.containerfile b/test/image-blueprints-bootc/layer2-presubmit/group1/rhel102-bootc-source.containerfile index 31bd43aaaf..b846b1a971 100644 --- a/test/image-blueprints-bootc/layer2-presubmit/group1/rhel102-bootc-source.containerfile +++ b/test/image-blueprints-bootc/layer2-presubmit/group1/rhel102-bootc-source.containerfile @@ -8,7 +8,7 @@ ARG USHIFT_RPM_REPO_PATH=/tmp/$USHIFT_RPM_REPO_NAME COPY ./rpm-repos/$USHIFT_RPM_REPO_NAME $USHIFT_RPM_REPO_PATH # Copy repository configuration -COPY ./bootc-images/$USHIFT_RPM_REPO_NAME.repo ./bootc-images/microshift-fast-datapath-rhel10.repo ./bootc-images/microshift-rhocp-y.repo \ +COPY ./bootc-images/$USHIFT_RPM_REPO_NAME.repo ./bootc-images/microshift-fast-datapath-rhel9.repo ./bootc-images/microshift-rhocp-y.repo \ /etc/yum.repos.d/ # Print repository configuration contents. diff --git a/test/image-blueprints-bootc/layer2-presubmit/group2/rhel102-bootc-source-optionals.containerfile b/test/image-blueprints-bootc/layer2-presubmit/group2/rhel102-bootc-source-optionals.containerfile index 0b6e5fa44c..d3ee09fe8c 100644 --- a/test/image-blueprints-bootc/layer2-presubmit/group2/rhel102-bootc-source-optionals.containerfile +++ b/test/image-blueprints-bootc/layer2-presubmit/group2/rhel102-bootc-source-optionals.containerfile @@ -8,7 +8,7 @@ ARG USHIFT_RPM_REPO_PATH=/tmp/$USHIFT_RPM_REPO_NAME COPY ./rpm-repos/$USHIFT_RPM_REPO_NAME $USHIFT_RPM_REPO_PATH # Copy repository configuration -COPY ./bootc-images/$USHIFT_RPM_REPO_NAME.repo ./bootc-images/microshift-fast-datapath-rhel10.repo ./bootc-images/microshift-rhocp-y.repo \ +COPY ./bootc-images/$USHIFT_RPM_REPO_NAME.repo ./bootc-images/microshift-fast-datapath-rhel9.repo ./bootc-images/microshift-rhocp-y.repo \ /etc/yum.repos.d/ # Print repository configuration contents. diff --git a/test/package-sources-bootc/microshift-fast-datapath-rhel10.repo b/test/package-sources-bootc/microshift-fast-datapath-rhel10.repo deleted file mode 100644 index ea238f8436..0000000000 --- a/test/package-sources-bootc/microshift-fast-datapath-rhel10.repo +++ /dev/null @@ -1,11 +0,0 @@ -[fast-datapath] -name = Fast Datapath for RHEL 10 -baseurl = https://cdn.redhat.com/content/dist/layered/rhel10/{{ .Env.UNAME_M }}/fast-datapath/os -enabled = 1 -gpgcheck = 1 -gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release -sslverify = 1 -sslcacert = /etc/rhsm/ca/redhat-uep.pem -sslclientkey = {{ .Env.SSL_CLIENT_KEY_FILE }} -sslclientcert = {{ .Env.SSL_CLIENT_CERT_FILE }} -skip_if_unavailable = 0 From 818f27bb0c3bc4facaab7dc464c547fd3ac55406 Mon Sep 17 00:00:00 2001 From: vanhalenar Date: Tue, 3 Mar 2026 09:52:31 +0000 Subject: [PATCH 19/19] Remove rhocp y1 repo from el102 images --- .../group2/rhel102-bootc-crel-isolated.containerfile | 2 +- .../group2/rhel102-bootc-crel-optionals.containerfile | 2 +- .../layer1-base/group2/rhel102-bootc-crel.containerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel-isolated.containerfile b/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel-isolated.containerfile index 611d5b6d8f..b11531e7ef 100644 --- a/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel-isolated.containerfile +++ b/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel-isolated.containerfile @@ -3,7 +3,7 @@ FROM localhost/rhel102-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 ./bootc-images/microshift-rhocp-y1.repo \ +COPY ./bootc-images/microshift-fast-datapath-rhel9.repo ./bootc-images/microshift-crel.repo ./bootc-images/microshift-rhocp-y.repo \ /etc/yum.repos.d/ # Print repository configuration contents. diff --git a/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel-optionals.containerfile b/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel-optionals.containerfile index f9fe7f33eb..82784af5c1 100644 --- a/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel-optionals.containerfile +++ b/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel-optionals.containerfile @@ -3,7 +3,7 @@ FROM localhost/rhel102-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 ./bootc-images/microshift-rhocp-y1.repo \ +COPY ./bootc-images/microshift-fast-datapath-rhel9.repo ./bootc-images/microshift-crel.repo ./bootc-images/microshift-rhocp-y.repo \ /etc/yum.repos.d/ # Print repository configuration contents. diff --git a/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel.containerfile b/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel.containerfile index ea5772bec2..f6296561db 100644 --- a/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel.containerfile +++ b/test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc-crel.containerfile @@ -3,7 +3,7 @@ FROM localhost/rhel102-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 ./bootc-images/microshift-rhocp-y1.repo \ +COPY ./bootc-images/microshift-fast-datapath-rhel9.repo ./bootc-images/microshift-crel.repo ./bootc-images/microshift-rhocp-y.repo \ /etc/yum.repos.d/ # Print repository configuration contents.