Skip to content

[release-4.19] USHIFT-5584: Revert to using rhel-9.6 base image for ISO generation in CI #5044

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

Merged
openshift-merge-bot merged 5 commits into from
Jun 12, 2025
Merged

[release-4.19] USHIFT-5584: Revert to using rhel-9.6 base image for ISO generation in CI #5044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
92c6585
Revert "Temporarily use centos base image for rhel-9.6 bootc ISO crea…
ggiguash Jun 4, 2025
a231310
Revert "Work around rhel-9.6 offline ISO build problem"
ggiguash Jun 4, 2025
f6a2b20
Revert "Work around OS version check in standard suite"
ggiguash Jun 4, 2025
03a7c26
Stop using rhel-9.6 from staging registry
ggiguash Jun 4, 2025
60059c5
Fix ami list filtering in manage_aws_stack.sh script
ggiguash Jun 4, 2025
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 scripts/aws/manage_aws_stack.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ get_amis() {
local -r region="${3}"
local ami_table
ami_table=$(aws ec2 describe-images --region "${region}" \
--filters "Name=name,Values=$(tr '[:lower:]' '[:upper:]' <<< "${os}")*HVM-*Hourly2-GP3" "Name=architecture,Values=${arch}*" \
--filters "Name=name,Values=$(tr '[:lower:]' '[:upper:]' <<< "${os}")*HVM*Hourly2-GP3" "Name=architecture,Values=${arch}*" \
--query 'Images[*].[Name,ImageId,Architecture]' --output text)

echo "${ami_table}" | sort -t'-' -k3,3r
Expand Down
7 changes: 1 addition & 6 deletions test/image-blueprints-bootc/layer1-base/group1/rhel96-test-agent.containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
# Note:
# This is a workaround for the problem described in https://issues.redhat.com/browse/USHIFT-5584.
# Revert to the rhel-9.6 base image when it is in GA.
#
# FROM registry.stage.redhat.io/rhel9-eus/rhel-9.6-bootc:9.6
FROM quay.io/centos-bootc/centos-bootc:stream9
FROM registry.redhat.io/rhel9-eus/rhel-9.6-bootc:9.6

# Build arguments
ARG USHIFT_RPM_REPO_NAME=microshift-local
Expand Down
7 changes: 1 addition & 6 deletions test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc.image-bootc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1 @@
# Note:
# This is a workaround for the problem described in https://issues.redhat.com/browse/USHIFT-5584.
# Revert to the rhel-9.6 base image when it is in GA.
#
# registry.stage.redhat.io/rhel9-eus/rhel-9.6-bootc:9.6
quay.io/centos-bootc/centos-bootc:stream9
registry.redhat.io/rhel9-eus/rhel-9.6-bootc:9.6
7 changes: 1 addition & 6 deletions test/scenarios-bootc/periodics/el96-crel@brew-standard1.sh.disabled
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,8 @@ scenario_remove_vms() {
remove_vm host1
}

# Note:
# This is a workaround for the problem described in https://issues.redhat.com/browse/USHIFT-5584.
# Revert to the rhel-9.6 base image when it is in GA.
#
# --variable "EXPECTED_OS_VERSION:9.6" \
scenario_run_tests() {
run_tests host1 \
--variable "EXPECTED_OS_VERSION:9" \
--variable "EXPECTED_OS_VERSION:9.6" \
suites/standard1/ suites/selinux/validate-selinux-policy.robot
}
7 changes: 1 addition & 6 deletions test/scenarios-bootc/presubmits/el96-src@standard-suite1.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,8 @@ scenario_remove_vms() {
remove_vm host1
}

# Note:
# This is a workaround for the problem described in https://issues.redhat.com/browse/USHIFT-5584.
# Revert to the rhel-9.6 base image when it is in GA.
#
# --variable "EXPECTED_OS_VERSION:9.6" \
scenario_run_tests() {
run_tests host1 \
--variable "EXPECTED_OS_VERSION:9" \
--variable "EXPECTED_OS_VERSION:9.6" \
suites/standard1/ suites/selinux/validate-selinux-policy.robot
}