Skip to content

Commit 8fbe59c

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #4658 from ggiguash/rhel-96-bootc
USHIFT-5463: Switch to rhel-9.6 in bootc blueprints
2 parents abe25a9 + 0ef026c commit 8fbe59c

File tree

59 files changed

+101
-101
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+101
-101
lines changed

‎test/image-blueprints-bootc/layer1-base/group1/rhel95-bootc-base.containerfile renamed to ‎test/image-blueprints-bootc/layer1-base/group1/rhel96-bootc-base.containerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.redhat.io/rhel9/rhel-bootc:9.5
1+
FROM registry.stage.redhat.io/rhel9-eus/rhel-9.6-bootc:9.6
22

33
# Build a container image to be used by Bootc Image Builder in the subsequent
44
# stages for producing ISO images.

‎test/image-blueprints-bootc/layer1-base/group1/rhel95-test-agent.containerfile renamed to ‎test/image-blueprints-bootc/layer1-base/group1/rhel96-test-agent.containerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.redhat.io/rhel9/rhel-bootc:9.5
1+
FROM registry.stage.redhat.io/rhel9-eus/rhel-9.6-bootc:9.6
22

33
# Build arguments
44
ARG USHIFT_RPM_REPO_NAME=microshift-local

‎test/image-blueprints-bootc/layer1-base/group2/rhel95-bootc.image-bootc

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎test/image-blueprints-bootc/layer1-base/group2/rhel95-bootc-brew.containerfile renamed to ‎test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-brew.containerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# {{- if env.Getenv "BREW_VERSION" "" -}}
22
# Note: This comment makes templating add a new line before the code
3-
FROM localhost/rhel95-test-agent:latest
3+
FROM localhost/rhel96-test-agent:latest
44

55
# Build arguments
66
ARG USHIFT_RPM_REPO_NAME=microshift-brew

‎test/image-blueprints-bootc/layer1-base/group2/rhel95-bootc-crel-optionals.containerfile renamed to ‎test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-crel-optionals.containerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# {{- if env.Getenv "CURRENT_RELEASE_VERSION" "" -}}
22
# Note: This comment makes templating add a new line before the code
3-
FROM localhost/rhel95-test-agent:latest
3+
FROM localhost/rhel96-test-agent:latest
44

55
# Copy repository configuration
66
COPY ./bootc-images/microshift-fast-datapath-rhel9.repo ./bootc-images/microshift-crel.repo ./bootc-images/microshift-rhocp-y.repo \

‎test/image-blueprints-bootc/layer1-base/group2/rhel95-bootc-crel.containerfile renamed to ‎test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-crel.containerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# {{- if env.Getenv "CURRENT_RELEASE_VERSION" "" -}}
22
# Note: This comment makes templating add a new line before the code
3-
FROM localhost/rhel95-test-agent:latest
3+
FROM localhost/rhel96-test-agent:latest
44

55
# Copy repository configuration
66
COPY ./bootc-images/microshift-fast-datapath-rhel9.repo ./bootc-images/microshift-crel.repo ./bootc-images/microshift-rhocp-y.repo \

‎test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc.image-bootc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
localhost/rhel96-bootc-base:latest

‎test/image-blueprints-bootc/layer2-source/group1/rhel95-bootc-source-base.containerfile renamed to ‎test/image-blueprints-bootc/layer2-source/group1/rhel96-bootc-source-base.containerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM localhost/rhel95-test-agent:latest
1+
FROM localhost/rhel96-test-agent:latest
22

33
# Build arguments
44
ARG USHIFT_RPM_REPO_NAME=microshift-base

‎test/image-blueprints-bootc/layer2-source/group1/rhel95-bootc-source.containerfile renamed to ‎test/image-blueprints-bootc/layer2-source/group1/rhel96-bootc-source.containerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM localhost/rhel95-test-agent:latest
1+
FROM localhost/rhel96-test-agent:latest
22

33
# Build arguments
44
ARG USHIFT_RPM_REPO_NAME=microshift-local

‎test/image-blueprints-bootc/layer2-source/group2/rhel95-bootc-source-aux.containerfile renamed to ‎test/image-blueprints-bootc/layer2-source/group2/rhel96-bootc-source-aux.containerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
FROM localhost/rhel95-bootc-source:latest
1+
FROM localhost/rhel96-bootc-source:latest
22
# Create another label for the source container image without any changes

0 commit comments

Comments
 (0)