Skip to content

USHIFT-6519: Switch to using RHEL 9.8 in bootc presubmits and periodics #6202

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
ggiguash wants to merge 8 commits into
base: main
Choose a base branch
from
+107 −92
Open

USHIFT-6519: Switch to using RHEL 9.8 in bootc presubmits and periodics #6202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
18098e9
Update layer1-base images
ggiguash Feb 23, 2026
221013a
Update layer2-presubmit images
ggiguash Feb 23, 2026
1c4c55d
Update layer3-periodic images
ggiguash Feb 23, 2026
0b1a8c8
Update presubmit scenarios
ggiguash Feb 23, 2026
928ed42
Add early-kernel repository for RHEL 9.8
ggiguash Feb 23, 2026
d0c4aa9
Increase priority of RHOCP mirror repositories
ggiguash Feb 23, 2026
d511766
Fix starting message in manage_webserver.sh
ggiguash Feb 23, 2026
519c796
Update periodic scenarios
ggiguash Feb 23, 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
3 changes: 2 additions & 1 deletion test/bin/manage_webserver.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ action_stop() {
}

action_start() {
echo "Starting web server in ${IMAGEDIR}"
mkdir -p "${IMAGEDIR}"
cd "${IMAGEDIR}"

Expand Down Expand Up @@ -76,6 +75,8 @@ EOF

# Restart the nginx web server
action_stop

echo "Starting web server in ${IMAGEDIR}"
nginx \
-c "${NGINX_CONFIG}" \
-e "${IMAGEDIR}/nginx.log"
Expand Down
2 changes: 1 addition & 1 deletion .../rhel96-bootc-crel-isolated.containerfile → .../rhel98-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/rhel96-test-agent:latest
FROM localhost/rhel98-test-agent:latest

# Copy repository configuration
COPY ./bootc-images/microshift-fast-datapath-rhel9.repo ./bootc-images/microshift-crel.repo ./bootc-images/microshift-rhocp-y.repo \
Expand Down
2 changes: 1 addition & 1 deletion ...rhel96-bootc-crel-optionals.containerfile → ...rhel98-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/rhel96-test-agent:latest
FROM localhost/rhel98-test-agent:latest

# Copy repository configuration
COPY ./bootc-images/microshift-fast-datapath-rhel9.repo ./bootc-images/microshift-crel.repo ./bootc-images/microshift-rhocp-y.repo \
Expand Down
2 changes: 1 addition & 1 deletion ...se/group2/rhel96-bootc-crel.containerfile → ...se/group2/rhel98-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/rhel96-test-agent:latest
FROM localhost/rhel98-test-agent:latest

# Copy repository configuration
COPY ./bootc-images/microshift-fast-datapath-rhel9.repo ./bootc-images/microshift-crel.repo ./bootc-images/microshift-rhocp-y.repo \
Expand Down
2 changes: 1 addition & 1 deletion ...p1/rhel96-bootc-source-base.containerfile → ...p1/rhel98-bootc-source-base.containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM localhost/rhel96-test-agent:latest
FROM localhost/rhel98-test-agent:latest

# Build arguments
ARG USHIFT_RPM_REPO_NAME=microshift-base
Expand Down
2 changes: 1 addition & 1 deletion .../group1/rhel96-bootc-source.containerfile → .../group1/rhel98-bootc-source.containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM localhost/rhel96-test-agent:latest
FROM localhost/rhel98-test-agent:latest

# Build arguments
ARG USHIFT_RPM_REPO_NAME=microshift-local
Expand Down
2 changes: 1 addition & 1 deletion ...up2/rhel96-bootc-source-aux.containerfile → ...up2/rhel98-bootc-source-aux.containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
FROM localhost/rhel96-bootc-source:latest
FROM localhost/rhel98-bootc-source:latest
# Create another label for the source container image without any changes
2 changes: 1 addition & 1 deletion ...ootc-source-fake-next-minor.containerfile → ...ootc-source-fake-next-minor.containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM localhost/rhel96-bootc-source:latest
FROM localhost/rhel98-bootc-source:latest

# Build arguments
ARG USHIFT_RPM_REPO_NAME=microshift-fake-next-minor
Expand Down
2 changes: 1 addition & 1 deletion ...p2/rhel96-bootc-source-fips.containerfile → ...p2/rhel98-bootc-source-fips.containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM localhost/rhel96-bootc-source:latest
FROM localhost/rhel98-bootc-source:latest

# Add fips=1 kernel argument
# See https://containers.github.io/bootc/building/kernel-arguments.html
Expand Down
2 changes: 1 addition & 1 deletion ...el96-bootc-source-optionals.containerfile → ...el98-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/rhel96-bootc-source:latest
FROM localhost/rhel98-bootc-source:latest

# Build arguments
ARG USHIFT_RPM_REPO_NAME=microshift-local
Expand Down
2 changes: 1 addition & 1 deletion ...otc-source-ai-model-serving.containerfile → ...otc-source-ai-model-serving.containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# {{- if and (env.Getenv "UNAME_M" "") (eq "x86_64" .Env.UNAME_M) }}
# Currently, RHOAI is only available for x86_64
FROM localhost/rhel96-bootc-source:latest
FROM localhost/rhel98-bootc-source:latest

# Build arguments
ARG USHIFT_RPM_REPO_NAME=microshift-local
Expand Down
2 changes: 1 addition & 1 deletion ...hel96-bootc-source-isolated.containerfile → ...hel98-bootc-source-isolated.containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM localhost/rhel96-bootc-source:latest
FROM localhost/rhel98-bootc-source:latest

# The qemu-guest-agent is used in offline tests
RUN dnf install -y qemu-guest-agent && \
Expand Down
1 change: 0 additions & 1 deletion test/image-blueprints-bootc/layer3-periodic/group2/rhel96-bootc-source-isolated.image-bootc
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...bootc-source-ai-model-serving.image-bootc → ...bootc-source-ai-model-serving.image-bootc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{{- if and (env.Getenv "UNAME_M" "") (eq "x86_64" .Env.UNAME_M) }}
localhost/rhel96-bootc-source-ai-model-serving:latest
localhost/rhel98-bootc-source-ai-model-serving:latest
{{- end }}
2 changes: 1 addition & 1 deletion .../rhel96-bootc-source-gitops.containerfile → .../rhel98-bootc-source-gitops.containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM localhost/rhel96-bootc-source:latest
FROM localhost/rhel98-bootc-source:latest

# Copy repository configuration
COPY ./bootc-images/microshift-gitops.repo \
Expand Down
1 change: 1 addition & 0 deletions test/image-blueprints-bootc/layer3-periodic/group2/rhel98-bootc-source-isolated.image-bootc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
localhost/rhel98-bootc-source-isolated:latest
3 changes: 3 additions & 0 deletions test/package-sources-bootc/microshift-rhocp-y.repo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,8 @@ baseurl = {{ .Env.RHOCP_MINOR_Y_BETA }}
enabled=1
gpgcheck=0
sslverify=1
# Increase the priority of the RHOCP beta repository to ensure its packages take
# precedence over RHEL mirror repositories
priority=50
skip_if_unavailable=0
{{- end -}}
3 changes: 3 additions & 0 deletions test/package-sources-bootc/microshift-rhocp-y1.repo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,8 @@ baseurl = {{ .Env.RHOCP_MINOR_Y1_BETA }}
enabled=1
gpgcheck=0
sslverify=1
# Increase the priority of the RHOCP beta repository to ensure its packages take
# precedence over RHEL mirror repositories
priority=50
skip_if_unavailable=0
{{- end -}}
8 changes: 8 additions & 0 deletions test/package-sources-bootc/rhel98-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-9.8-early-kernel]
name = rhel-9.8-early-kernel
baseurl = http://localhost:{{ .Env.WEB_SERVER_PORT }}/ocp-mirror/reposync/4.22{{ if eq .Env.UNAME_M "aarch64" }}_aarch64{{ end }}/rhel-98-early-kernel
enabled = 1
sslverify = false
gpgcheck = 0
skip_if_unavailable = false
2 changes: 1 addition & 1 deletion ...@el96-src@upgrade-fails-and-rolls-back.sh → ...@el98-src@upgrade-fails-and-rolls-back.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 "FAILING_REF:rhel96-bootc-source" \
--variable "FAILING_REF:rhel98-bootc-source" \
--variable "REASON:fail_greenboot" \
--variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \
suites/upgrade/upgrade-fails-and-rolls-back.robot
Expand Down
2 changes: 1 addition & 1 deletion ...eriodics/el96-prel@el96-src@upgrade-ok.sh → ...eriodics/el96-prel@el98-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:rhel96-bootc-source" \
--variable "TARGET_REF:rhel98-bootc-source" \
--variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \
suites/upgrade/upgrade-successful.robot
}
2 changes: 1 addition & 1 deletion ...-prel@el96-src@upgrade-ostree2bootc-ok.sh → ...-prel@el98-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:rhel96-bootc-source" \
--variable "TARGET_REF:rhel98-bootc-source" \
--variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \
suites/upgrade/upgrade-successful.robot
}
2 changes: 1 addition & 1 deletion ...odics/el96-yminus2@el96-src@upgrade-ok.sh → ...odics/el96-yminus2@el98-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:rhel96-bootc-source" \
--variable "TARGET_REF:rhel98-bootc-source" \
--variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \
suites/upgrade/upgrade-successful.robot
}
2 changes: 1 addition & 1 deletion ...inus2@el96-src@upgrade-ostree2bootc-ok.sh → ...inus2@el98-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:rhel96-bootc-source" \
--variable "TARGET_REF:rhel98-bootc-source" \
--variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \
suites/upgrade/upgrade-successful.robot
}
4 changes: 2 additions & 2 deletions ...dics/el96-src@ai-model-serving-offline.sh → ...dics/el98-src@ai-model-serving-offline.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ scenario_create_vms() {
check_platform true

# Increased disk size because of the additional embedded images (especially OVMS which is ~3.5GiB)
LVM_SYSROOT_SIZE=20480 prepare_kickstart host1 kickstart-bootc-offline.ks.template rhel96-bootc-source-ai-model-serving
launch_vm --boot_blueprint rhel96-bootc-source-ai-model-serving --no_network --vm_disksize 30
LVM_SYSROOT_SIZE=20480 prepare_kickstart host1 kickstart-bootc-offline.ks.template rhel98-bootc-source-ai-model-serving
launch_vm --boot_blueprint rhel98-bootc-source-ai-model-serving --no_network --vm_disksize 30
}

scenario_remove_vms() {
Expand Down
8 changes: 4 additions & 4 deletions ...tc/periodics/el96-src@cncf-conformance.sh → ...tc/periodics/el98-src@cncf-conformance.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,10 +171,10 @@ run_sonobuoy() {
}

scenario_create_vms() {
prepare_kickstart host1 kickstart-bootc.ks.template rhel96-bootc-source
prepare_kickstart host2 kickstart-bootc.ks.template rhel96-bootc-source
launch_vm --vmname host1 --boot_blueprint rhel96-bootc
launch_vm --vmname host2 --boot_blueprint rhel96-bootc
prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source
prepare_kickstart host2 kickstart-bootc.ks.template rhel98-bootc-source
launch_vm --vmname host1 --boot_blueprint rhel98-bootc
launch_vm --vmname host2 --boot_blueprint rhel98-bootc
}

scenario_remove_vms() {
Expand Down
4 changes: 2 additions & 2 deletions ...ics/el96-src@fault-tests-and-greenboot.sh → ...ics/el98-src@fault-tests-and-greenboot.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 rhel96-bootc-source
launch_vm --boot_blueprint rhel96-bootc
prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source
launch_vm --boot_blueprint rhel98-bootc
}

scenario_remove_vms() {
Expand Down
4 changes: 2 additions & 2 deletions ...cenarios-bootc/periodics/el96-src@fips.sh → ...cenarios-bootc/periodics/el98-src@fips.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ check_platform() {
scenario_create_vms() {
check_platform

prepare_kickstart host1 kickstart-bootc.ks.template rhel96-bootc-source-fips true
launch_vm --boot_blueprint rhel96-bootc --fips
prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source-fips true
launch_vm --boot_blueprint rhel98-bootc --fips
}

scenario_remove_vms() {
Expand Down
4 changes: 2 additions & 2 deletions ...src@gitops-telemetry-clusterid-systemd.sh → ...src@gitops-telemetry-clusterid-systemd.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 rhel96-bootc-source-gitops
launch_vm --boot_blueprint rhel96-bootc
prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source-gitops
launch_vm --boot_blueprint rhel98-bootc
}

scenario_remove_vms() {
Expand Down
4 changes: 2 additions & 2 deletions ...-bootc/periodics/el96-src@isolated-net.sh → ...-bootc/periodics/el98-src@isolated-net.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ VM_BRIDGE_IP="$(get_vm_bridge_ip "${VM_ISOLATED_NETWORK}")"
MIRROR_REGISTRY_URL="${VM_BRIDGE_IP}:${MIRROR_REGISTRY_PORT}/microshift"

scenario_create_vms() {
prepare_kickstart host1 kickstart-bootc-isolated.ks.template rhel96-bootc-source-isolated
prepare_kickstart host1 kickstart-bootc-isolated.ks.template rhel98-bootc-source-isolated
# Use the isolated network when creating a VM
launch_vm --boot_blueprint rhel96-bootc --network "${VM_ISOLATED_NETWORK}"
launch_vm --boot_blueprint rhel98-bootc --network "${VM_ISOLATED_NETWORK}"
}

scenario_remove_vms() {
Expand Down
4 changes: 2 additions & 2 deletions ...arios-bootc/periodics/el96-src@offline.sh → ...arios-bootc/periodics/el98-src@offline.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-offline.ks.template rhel96-bootc-source-isolated
launch_vm --boot_blueprint rhel96-bootc-source-isolated --no_network
prepare_kickstart host1 kickstart-bootc-offline.ks.template rhel98-bootc-source-isolated
launch_vm --boot_blueprint rhel98-bootc-source-isolated --no_network
}

scenario_remove_vms() {
Expand Down
4 changes: 2 additions & 2 deletions ...riodics/el96-src@osconfig-cleanup-data.sh → ...riodics/el98-src@osconfig-cleanup-data.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 rhel96-bootc-source
launch_vm --boot_blueprint rhel96-bootc
prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source
launch_vm --boot_blueprint rhel98-bootc
}

scenario_remove_vms() {
Expand Down
4 changes: 2 additions & 2 deletions .../periodics/el96-src@osconfig-lifecycle.sh → .../periodics/el98-src@osconfig-lifecycle.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 rhel96-bootc-source
launch_vm --boot_blueprint rhel96-bootc
prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source
launch_vm --boot_blueprint rhel98-bootc
}

scenario_remove_vms() {
Expand Down
6 changes: 3 additions & 3 deletions ...s/el96-src@upgrade-fails-cannot-backup.sh → ...s/el98-src@upgrade-fails-cannot-backup.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 rhel96-bootc-source
launch_vm --boot_blueprint rhel96-bootc
prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source
launch_vm --boot_blueprint rhel98-bootc
}

scenario_remove_vms() {
Expand All @@ -13,7 +13,7 @@ scenario_remove_vms() {

scenario_run_tests() {
run_tests host1 \
--variable "FAILING_REF:rhel96-bootc-source-aux" \
--variable "FAILING_REF:rhel98-bootc-source-aux" \
--variable "REASON:prevent_backup" \
--variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \
suites/upgrade/upgrade-fails-and-rolls-back.robot
Expand Down
2 changes: 1 addition & 1 deletion ...esubmits/el96-prel@el96-src@upgrade-ok.sh → ...esubmits/el96-prel@el98-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:rhel96-bootc-source" \
--variable "TARGET_REF:rhel98-bootc-source" \
--variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \
suites/upgrade/upgrade-successful.robot
}
6 changes: 3 additions & 3 deletions ...esubmits/el96-base@el96-src@upgrade-ok.sh → ...esubmits/el98-base@el98-src@upgrade-ok.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 rhel96-bootc-source-base
launch_vm --boot_blueprint rhel96-bootc
prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source-base
launch_vm --boot_blueprint rhel98-bootc
}

scenario_remove_vms() {
Expand All @@ -13,7 +13,7 @@ scenario_remove_vms() {

scenario_run_tests() {
run_tests host1 \
--variable "TARGET_REF:rhel96-bootc-source" \
--variable "TARGET_REF:rhel98-bootc-source" \
--variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \
suites/upgrade/upgrade-successful.robot
}
14 changes: 7 additions & 7 deletions ...its/el96-base@src@opt@delta-upgrade-ok.sh → ...its/el98-base@src@opt@delta-upgrade-ok.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@
# Sourced from scenario.sh and uses functions defined there.

scenario_create_vms() {
prepare_kickstart host1 kickstart-bootc.ks.template rhel96-bootc-source-base
launch_vm --boot_blueprint rhel96-bootc
prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source-base
launch_vm --boot_blueprint rhel98-bootc
}

scenario_remove_vms() {
remove_vm host1
}

scenario_run_tests() {
prepare_static_delta rhel96-bootc-source-base rhel96-bootc-source
apply_static_delta rhel96-bootc-source-base rhel96-bootc-source
prepare_static_delta rhel98-bootc-source-base rhel98-bootc-source
apply_static_delta rhel98-bootc-source-base rhel98-bootc-source

prepare_static_delta rhel96-bootc-source rhel96-bootc-source-optionals
apply_static_delta rhel96-bootc-source rhel96-bootc-source-optionals
prepare_static_delta rhel98-bootc-source rhel98-bootc-source-optionals
apply_static_delta rhel98-bootc-source rhel98-bootc-source-optionals

for ref in rhel96-bootc-source-from-sdelta rhel96-bootc-source-optionals-from-sdelta ; do
for ref in rhel98-bootc-source-from-sdelta rhel98-bootc-source-optionals-from-sdelta ; do
run_tests host1 \
--variable "TARGET_REF:${ref}" \
--variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \
Expand Down
4 changes: 2 additions & 2 deletions ...bmits/el96-src@ai-model-serving-online.sh → ...bmits/el98-src@ai-model-serving-online.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ scenario_create_vms() {
check_platform true

# Increased disk size because of the additional embedded images (especially OVMS which is ~3.5GiB)
LVM_SYSROOT_SIZE=20480 prepare_kickstart host1 kickstart-bootc.ks.template rhel96-bootc-source-optionals
launch_vm --boot_blueprint rhel96-bootc --vm_disksize 30 --vm_vcpus 4
LVM_SYSROOT_SIZE=20480 prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source-optionals
launch_vm --boot_blueprint rhel98-bootc --vm_disksize 30 --vm_vcpus 4
}

scenario_remove_vms() {
Expand Down
4 changes: 2 additions & 2 deletions ...ootc/presubmits/el96-src@auto-recovery.sh → ...ootc/presubmits/el98-src@auto-recovery.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 rhel96-bootc-source
launch_vm --boot_blueprint rhel96-bootc
prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source
launch_vm --boot_blueprint rhel98-bootc
}

scenario_remove_vms() {
Expand Down
4 changes: 2 additions & 2 deletions .../el96-src@backup-and-restore-on-reboot.sh → .../el98-src@backup-and-restore-on-reboot.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 rhel96-bootc-source
launch_vm --boot_blueprint rhel96-bootc
prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source
launch_vm --boot_blueprint rhel98-bootc
}

scenario_remove_vms() {
Expand Down
Loading