From 02dca6162235c0f5c6abe3fecfba10cb8a2431f7 Mon Sep 17 00:00:00 2001 From: Gregory Giguashvili Date: Wed, 4 Jun 2025 17:45:10 +0300 Subject: [PATCH 1/7] Revert "Temporarily use centos base image for rhel-9.6 bootc ISO creation" This reverts commit fccc6293d2f0fc8462fec9769317977db7d44e8e. --- .../layer1-base/group2/rhel96-bootc.image-bootc | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc.image-bootc b/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc.image-bootc index 51606a89d1..2251f5a13a 100644 --- a/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc.image-bootc +++ b/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc.image-bootc @@ -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.stage.redhat.io/rhel9-eus/rhel-9.6-bootc:9.6 \ No newline at end of file From d01b81cfba0eeb3b03bbe9cda4de40b51b92717c Mon Sep 17 00:00:00 2001 From: Gregory Giguashvili Date: Wed, 4 Jun 2025 17:45:32 +0300 Subject: [PATCH 2/7] Revert "Work around rhel-9.6 offline ISO build problem" This reverts commit 1a02554cf02ad3bf1f758be5bfb51d516fdabe02. --- .../layer1-base/group1/rhel96-test-agent.containerfile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/test/image-blueprints-bootc/layer1-base/group1/rhel96-test-agent.containerfile b/test/image-blueprints-bootc/layer1-base/group1/rhel96-test-agent.containerfile index d78a25e20f..58add11486 100644 --- a/test/image-blueprints-bootc/layer1-base/group1/rhel96-test-agent.containerfile +++ b/test/image-blueprints-bootc/layer1-base/group1/rhel96-test-agent.containerfile @@ -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.stage.redhat.io/rhel9-eus/rhel-9.6-bootc:9.6 # Build arguments ARG USHIFT_RPM_REPO_NAME=microshift-local From f6fe3f9707d0e40b382bc1c2d6b7b84bcf69eba9 Mon Sep 17 00:00:00 2001 From: Gregory Giguashvili Date: Wed, 4 Jun 2025 17:45:52 +0300 Subject: [PATCH 3/7] Revert "Work around OS version check in standard suite" This reverts commit 5aee1acc0f37d34b5fd36e0fe6093cec74dc5d00. --- test/scenarios-bootc/periodics/el96-crel@brew-standard1.sh | 7 +------ .../scenarios-bootc/presubmits/el96-src@standard-suite1.sh | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/test/scenarios-bootc/periodics/el96-crel@brew-standard1.sh b/test/scenarios-bootc/periodics/el96-crel@brew-standard1.sh index 55c040c7fb..96eb3ca22c 100644 --- a/test/scenarios-bootc/periodics/el96-crel@brew-standard1.sh +++ b/test/scenarios-bootc/periodics/el96-crel@brew-standard1.sh @@ -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 } diff --git a/test/scenarios-bootc/presubmits/el96-src@standard-suite1.sh b/test/scenarios-bootc/presubmits/el96-src@standard-suite1.sh index 253bac3200..d30951a6ce 100644 --- a/test/scenarios-bootc/presubmits/el96-src@standard-suite1.sh +++ b/test/scenarios-bootc/presubmits/el96-src@standard-suite1.sh @@ -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 } From 3817c724551b8fbeb006edd23ec6a6f2cdb50816 Mon Sep 17 00:00:00 2001 From: Gregory Giguashvili Date: Wed, 4 Jun 2025 17:49:26 +0300 Subject: [PATCH 4/7] Update bib to 9.6 EUS version --- test/bin/pyutils/build_bootc_images.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/bin/pyutils/build_bootc_images.py b/test/bin/pyutils/build_bootc_images.py index 571dedc91d..11c5a6488f 100644 --- a/test/bin/pyutils/build_bootc_images.py +++ b/test/bin/pyutils/build_bootc_images.py @@ -32,7 +32,7 @@ PULL_SECRET = common.get_env_var('PULL_SECRET', f"{HOME_DIR}/.pull-secret.json") # Switch to quay.io/centos-bootc/bootc-image-builder:latest if any new upstream # features are required -BIB_IMAGE = "registry.redhat.io/rhel9/bootc-image-builder:latest" +BIB_IMAGE = "registry.redhat.io/rhel9-eus/rhel-9.6-bootc-image-builder:9.6" GOMPLATE = common.get_env_var('GOMPLATE') MIRROR_REGISTRY = common.get_env_var('MIRROR_REGISTRY_URL') FORCE_REBUILD = False From 726b5af92e41908ae336fc23442c0b99ac697acc Mon Sep 17 00:00:00 2001 From: Gregory Giguashvili Date: Wed, 4 Jun 2025 17:54:33 +0300 Subject: [PATCH 5/7] Stop using rhel-9.6 from staging registry --- .../layer1-base/group1/rhel96-test-agent.containerfile | 2 +- .../layer1-base/group2/rhel96-bootc.image-bootc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/image-blueprints-bootc/layer1-base/group1/rhel96-test-agent.containerfile b/test/image-blueprints-bootc/layer1-base/group1/rhel96-test-agent.containerfile index 58add11486..0fb3dc0573 100644 --- a/test/image-blueprints-bootc/layer1-base/group1/rhel96-test-agent.containerfile +++ b/test/image-blueprints-bootc/layer1-base/group1/rhel96-test-agent.containerfile @@ -1,4 +1,4 @@ -FROM registry.stage.redhat.io/rhel9-eus/rhel-9.6-bootc:9.6 +FROM registry.redhat.io/rhel9-eus/rhel-9.6-bootc:9.6 # Build arguments ARG USHIFT_RPM_REPO_NAME=microshift-local diff --git a/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc.image-bootc b/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc.image-bootc index 2251f5a13a..d802c92dda 100644 --- a/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc.image-bootc +++ b/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc.image-bootc @@ -1 +1 @@ -registry.stage.redhat.io/rhel9-eus/rhel-9.6-bootc:9.6 \ No newline at end of file +registry.redhat.io/rhel9-eus/rhel-9.6-bootc:9.6 \ No newline at end of file From c261218971954e9077fa24bb11489957b3f98e0c Mon Sep 17 00:00:00 2001 From: Gregory Giguashvili Date: Wed, 4 Jun 2025 19:58:26 +0300 Subject: [PATCH 6/7] Revert "Update bib to 9.6 EUS version" This reverts commit 3817c724551b8fbeb006edd23ec6a6f2cdb50816. --- test/bin/pyutils/build_bootc_images.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/bin/pyutils/build_bootc_images.py b/test/bin/pyutils/build_bootc_images.py index 11c5a6488f..571dedc91d 100644 --- a/test/bin/pyutils/build_bootc_images.py +++ b/test/bin/pyutils/build_bootc_images.py @@ -32,7 +32,7 @@ PULL_SECRET = common.get_env_var('PULL_SECRET', f"{HOME_DIR}/.pull-secret.json") # Switch to quay.io/centos-bootc/bootc-image-builder:latest if any new upstream # features are required -BIB_IMAGE = "registry.redhat.io/rhel9-eus/rhel-9.6-bootc-image-builder:9.6" +BIB_IMAGE = "registry.redhat.io/rhel9/bootc-image-builder:latest" GOMPLATE = common.get_env_var('GOMPLATE') MIRROR_REGISTRY = common.get_env_var('MIRROR_REGISTRY_URL') FORCE_REBUILD = False From f1e9055023c75f123117f2ccad4a97ed1b8f70a5 Mon Sep 17 00:00:00 2001 From: Gregory Giguashvili Date: Wed, 4 Jun 2025 10:46:19 +0300 Subject: [PATCH 7/7] Fix ami list filtering in manage_aws_stack.sh script --- scripts/aws/manage_aws_stack.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/aws/manage_aws_stack.sh b/scripts/aws/manage_aws_stack.sh index d3586e335a..004e908673 100755 --- a/scripts/aws/manage_aws_stack.sh +++ b/scripts/aws/manage_aws_stack.sh @@ -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