Skip to content

USHIFT-6498: Bump existing RHEL 10.0 periodics and presubmits to 10.2 #6244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vanhalenar wants to merge 18 commits into
base: main
Choose a base branch
from
Open

USHIFT-6498: Bump existing RHEL 10.0 periodics and presubmits to 10.2 #6244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
edb46d7
Bump 10.0 bootc scenarios to 10.2
vanhalenar Feb 18, 2026
def8c98
Bump 10.0 bootc blueprints to 10.2
vanhalenar Feb 18, 2026
8fe0d6e
Fix expected os ver
vanhalenar Feb 20, 2026
0749a20
Bump missed upgrade test
vanhalenar Feb 20, 2026
d577f63
Add early kernel repo
vanhalenar Feb 23, 2026
636bf6f
Add missing test
vanhalenar Feb 25, 2026
02b84b2
Fix upgrade test target ref, skip generic device plugin test
vanhalenar Feb 25, 2026
7bc9d22
Delete extra scenario
vanhalenar Feb 25, 2026
c0fc46b
Skip generic device plugin in release tests
vanhalenar Feb 25, 2026
07bf228
Add Fast datapath repo for RHEL 10
vanhalenar Feb 25, 2026
6010d1c
Add 4.21 repos to crel images because of crio
vanhalenar Feb 25, 2026
372e0ac
Add 98 -> 102 upgrade test
vanhalenar Feb 25, 2026
f20415e
Add rhocp y1 repo to isolated image
vanhalenar Feb 25, 2026
a9b02c7
Skip gdp test in the right containerfile and unskip in the wrong one
vanhalenar Feb 25, 2026
80a5f12
Restore release tests
vanhalenar Mar 2, 2026
d586ca8
Fix release test name
vanhalenar Mar 2, 2026
ae2e68a
Fix release test again
vanhalenar Mar 2, 2026
5e42382
Remove rhel 10 fast datapath repo
vanhalenar Mar 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 0 additions & 22 deletions test/image-blueprints-bootc/layer1-base/group1/rhel100-test-agent.containerfile
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion test/image-blueprints-bootc/layer1-base/group2/rhel100-bootc.image-bootc
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ...rhel100-bootc-crel-isolated.containerfile → ...rhel102-bootc-crel-isolated.containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# {{- 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 \
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 link
Contributor

@ggiguash ggiguash Mar 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are we adding rhocp-y1 repos? These should not be required here.

/etc/yum.repos.d/

# Print repository configuration contents.
Expand Down
4 changes: 2 additions & 2 deletions ...hel100-bootc-crel-optionals.containerfile → ...hel102-bootc-crel-optionals.containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# {{- 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 \
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.
Expand Down
4 changes: 2 additions & 2 deletions ...e/group2/rhel100-bootc-crel.containerfile → ...e/group2/rhel102-bootc-crel.containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# {{- 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 \
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.
Expand Down
2 changes: 1 addition & 1 deletion ...group1/rhel100-bootc-source.containerfile → ...group1/rhel102-bootc-source.containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 4 additions & 3 deletions ...l100-bootc-source-optionals.containerfile → ...l102-bootc-source-optionals.containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
7 changes: 4 additions & 3 deletions ...00-bootc-brew-lrel-optional.containerfile → ...02-bootc-brew-lrel-optional.containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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 -}}
2 changes: 1 addition & 1 deletion ...e/group1/rhel100-bootc-brew.containerfile → ...e/group1/rhel102-bootc-brew.containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 8 additions & 0 deletions test/package-sources-bootc/rhel102-mirror.repo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 4 additions & 2 deletions ...ios-bootc/periodics/el100-src@optional.sh → ...ios-bootc/periodics/el102-src@optional.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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)" \
Expand Down
6 changes: 3 additions & 3 deletions ...tc/periodics/el100-src@standard-suite1.sh → ...tc/periodics/el102-src@standard-suite1.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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/
}
4 changes: 2 additions & 2 deletions ...tc/periodics/el100-src@standard-suite2.sh → ...tc/periodics/el102-src@standard-suite2.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion ...prel@el100-src@upgrade-ostree2bootc-ok.sh → ...prel@el102-src@upgrade-ostree2bootc-ok.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
2 changes: 1 addition & 1 deletion ...nus2@el100-src@upgrade-ostree2bootc-ok.sh → ...nus2@el102-src@upgrade-ostree2bootc-ok.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
2 changes: 1 addition & 1 deletion ...esubmits/el98-src@el100-src@upgrade-ok.sh → ...eriodics/el98-src@el102-src@upgrade-ok.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
2 changes: 1 addition & 1 deletion ...submits/el96-prel@el100-src@upgrade-ok.sh → ...submits/el96-prel@el102-src@upgrade-ok.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
2 changes: 1 addition & 1 deletion ...mits/el96-yminus2@el100-src@upgrade-ok.sh → ...mits/el96-yminus2@el102-src@upgrade-ok.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
19 changes: 19 additions & 0 deletions test/scenarios-bootc/presubmits/el98-src@el102-src@upgrade-ok.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}