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 81% 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..d3ee09fe8c 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 @@ -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/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 90% 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..ac9d4de84c 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 @@ -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/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 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 diff --git a/test/scenarios-bootc/periodics/el100-src@optional.sh b/test/scenarios-bootc/periodics/el102-src@optional.sh similarity index 83% rename from test/scenarios-bootc/periodics/el100-src@optional.sh rename to test/scenarios-bootc/periodics/el102-src@optional.sh index 2fd29a0800..3385a45152 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() { @@ -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/periodics/el100-src@standard-suite1.sh b/test/scenarios-bootc/periodics/el102-src@standard-suite1.sh similarity index 59% rename from test/scenarios-bootc/periodics/el100-src@standard-suite1.sh rename to test/scenarios-bootc/periodics/el102-src@standard-suite1.sh index c44327f811..1f4231a5f1 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() { @@ -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/ } 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-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 } 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/el98-src@el100-src@upgrade-ok.sh b/test/scenarios-bootc/periodics/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/periodics/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/periodics/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 } 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/presubmits/el98-src@el102-src@upgrade-ok.sh b/test/scenarios-bootc/presubmits/el98-src@el102-src@upgrade-ok.sh new file mode 100644 index 0000000000..7084d8fa86 --- /dev/null +++ b/test/scenarios-bootc/presubmits/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 +}