Skip to content

USHIFT-6498: Bump RHEL 10.0 tests to 10.2 using staging registry #6148

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 2 commits into
base: main
Choose a base branch
from
Open

USHIFT-6498: Bump RHEL 10.0 tests to 10.2 using staging registry #6148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93313da
Bump 10.0->10.2
vanhalenar Jan 26, 2026
e233a8b
Bump RHEL version in more files
vanhalenar Jan 26, 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
2 changes: 1 addition & 1 deletion ...e/group1/rhel100-test-agent.containerfile → ...e/group1/rhel102-test-agent.containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.redhat.io/rhel10/rhel-bootc:10.0
FROM registry.stage.redhat.io/rhel10/rhel-bootc:10.2

# Build arguments
ARG USHIFT_RPM_REPO_NAME=microshift-local
Expand Down
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.

2 changes: 1 addition & 1 deletion ...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,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 \
Expand Down
2 changes: 1 addition & 1 deletion ...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,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 \
Expand Down
2 changes: 1 addition & 1 deletion ...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,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 \
Expand Down
1 change: 1 addition & 0 deletions test/image-blueprints-bootc/layer1-base/group2/rhel102-bootc.image-bootc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
registry.stage.redhat.io/rhel10/rhel-bootc:10.2
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
2 changes: 1 addition & 1 deletion ...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
2 changes: 1 addition & 1 deletion ...bootc-brew-ec-with-optional.containerfile → ...bootc-brew-ec-with-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_EC_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
2 changes: 1 addition & 1 deletion ...bootc-brew-rc-with-optional.containerfile → ...bootc-brew-rc-with-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_RC_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
2 changes: 1 addition & 1 deletion ...-brew-zstream-with-optional.containerfile → ...-brew-zstream-with-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_Y0_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
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
4 changes: 2 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 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 ...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 ...esubmits/el96-src@el100-src@upgrade-ok.sh → ...esubmits/el96-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 ...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
}
4 changes: 2 additions & 2 deletions ...bootc/releases/el100-lrel@ginkgo-tests.sh → ...bootc/releases/el102-lrel@ginkgo-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Sourced from scenario.sh and uses functions defined there.

start_image="rhel100-bootc-brew-${LATEST_RELEASE_TYPE}-with-optional"
start_image="rhel102-bootc-brew-${LATEST_RELEASE_TYPE}-with-optional"

scenario_create_vms() {
if ! does_image_exist "${start_image}"; then
Expand All @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions ...ios-bootc/releases/el100-lrel@optional.sh → ...ios-bootc/releases/el102-lrel@optional.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-${LATEST_RELEASE_TYPE}-with-optional"
start_image="rhel102-bootc-brew-${LATEST_RELEASE_TYPE}-with-optional"

scenario_create_vms() {
exit_if_image_not_found "${start_image}"
Expand All @@ -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() {
Expand Down
6 changes: 3 additions & 3 deletions ...os-bootc/releases/el100-lrel@standard1.sh → ...os-bootc/releases/el102-lrel@standard1.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Sourced from scenario.sh and uses functions defined there.

start_image="rhel100-bootc-brew-${LATEST_RELEASE_TYPE}-with-optional"
start_image="rhel102-bootc-brew-${LATEST_RELEASE_TYPE}-with-optional"

scenario_create_vms() {
if ! does_image_exist "${start_image}"; then
Expand All @@ -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() {
Expand All @@ -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/
}
4 changes: 2 additions & 2 deletions ...os-bootc/releases/el100-lrel@standard2.sh → ...os-bootc/releases/el102-lrel@standard2.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Sourced from scenario.sh and uses functions defined there.

start_image="rhel100-bootc-brew-${LATEST_RELEASE_TYPE}-with-optional"
start_image="rhel102-bootc-brew-${LATEST_RELEASE_TYPE}-with-optional"

scenario_create_vms() {
if ! does_image_exist "${start_image}"; then
Expand All @@ -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() {
Expand Down