From e6739ea5f24236d56a118c73024529dbe0adb4ad Mon Sep 17 00:00:00 2001 From: Gregory Giguashvili Date: Tue, 18 Mar 2025 10:17:04 +0200 Subject: [PATCH] Remove the container layer workaround when building RHEL ISO --- .../layer1-base/group1/rhel94-bootc-base.containerfile | 6 ------ .../layer1-base/group1/rhel96-bootc-base.containerfile | 6 ------ .../layer1-base/group2/rhel94-bootc.image-bootc | 2 +- .../layer1-base/group2/rhel96-bootc.image-bootc | 2 +- 4 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 test/image-blueprints-bootc/layer1-base/group1/rhel94-bootc-base.containerfile delete mode 100644 test/image-blueprints-bootc/layer1-base/group1/rhel96-bootc-base.containerfile diff --git a/test/image-blueprints-bootc/layer1-base/group1/rhel94-bootc-base.containerfile b/test/image-blueprints-bootc/layer1-base/group1/rhel94-bootc-base.containerfile deleted file mode 100644 index 01a646ec95..0000000000 --- a/test/image-blueprints-bootc/layer1-base/group1/rhel94-bootc-base.containerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM registry.redhat.io/rhel9-eus/rhel-9.4-bootc:9.4 - -# Build a container image to be used by Bootc Image Builder in the subsequent -# stages for producing ISO images. -# -# This is a workaround until https://issues.redhat.com/browse/RHEL-34807 is fixed. diff --git a/test/image-blueprints-bootc/layer1-base/group1/rhel96-bootc-base.containerfile b/test/image-blueprints-bootc/layer1-base/group1/rhel96-bootc-base.containerfile deleted file mode 100644 index d6a8eb2f56..0000000000 --- a/test/image-blueprints-bootc/layer1-base/group1/rhel96-bootc-base.containerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM registry.stage.redhat.io/rhel9-eus/rhel-9.6-bootc:9.6 - -# Build a container image to be used by Bootc Image Builder in the subsequent -# stages for producing ISO images. -# -# This is a workaround until https://issues.redhat.com/browse/RHEL-34807 is fixed. diff --git a/test/image-blueprints-bootc/layer1-base/group2/rhel94-bootc.image-bootc b/test/image-blueprints-bootc/layer1-base/group2/rhel94-bootc.image-bootc index 3812b99467..60c1f57ef5 100644 --- a/test/image-blueprints-bootc/layer1-base/group2/rhel94-bootc.image-bootc +++ b/test/image-blueprints-bootc/layer1-base/group2/rhel94-bootc.image-bootc @@ -1 +1 @@ -localhost/rhel94-bootc-base:latest \ No newline at end of file +registry.redhat.io/rhel9-eus/rhel-9.4-bootc:9.4 \ No newline at end of file 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 b9047daf62..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 +1 @@ -localhost/rhel96-bootc-base:latest \ No newline at end of file +registry.stage.redhat.io/rhel9-eus/rhel-9.6-bootc:9.6 \ No newline at end of file