Skip to content

[release-4.19] USHIFT-7042: Enable EUS repos for RHEL 9.4 and 9.6 bootc test images #6735

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
pacevedom wants to merge 2 commits into
base: release-4.19
Choose a base branch
from
+21 −1
Open

[release-4.19] USHIFT-7042: Enable EUS repos for RHEL 9.4 and 9.6 bootc test images #6735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1aeac32
USHIFT-7042: Enable EUS repos for RHEL 9.4 and 9.6 bootc test images
pacevedom May 26, 2026
2051bd3
USHIFT-7042: temp, remove commit
pacevedom May 26, 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
2 changes: 1 addition & 1 deletion test/bin/ci_phase_iso_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ run_bootc_image_build() {
make -C "${ROOTDIR}" verify-containers

if [ -v CI_JOB_NAME ] ; then
$(dry_run) bash -x ./bin/build_bootc_images.sh -l ./image-blueprints-bootc/layer1-base
$(dry_run) bash -x ./bin/build_bootc_images.sh -f -l ./image-blueprints-bootc/layer1-base
$(dry_run) bash -x ./bin/build_bootc_images.sh -l ./image-blueprints-bootc/layer2-presubmit

if [[ "${CI_JOB_NAME}" =~ .*periodic.* ]]; then
Expand Down
10 changes: 10 additions & 0 deletions test/image-blueprints-bootc/layer1-base/group1/rhel94-test-agent.containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,16 @@ FROM registry.redhat.io/rhel9-eus/rhel-9.4-bootc:9.4
ARG USHIFT_RPM_REPO_NAME=microshift-local
ARG USHIFT_RPM_REPO_PATH=/tmp/$USHIFT_RPM_REPO_NAME

# Lock the OS release version and enable EUS repositories to prevent
# the installation of packages belonging to a newer OS release
# hadolint ignore=SC1091
RUN source /etc/os-release && \
echo "${VERSION_ID}" > /etc/dnf/vars/releasever && \
dnf config-manager --set-disabled '*' && \
dnf config-manager --set-enabled \
"rhel-9-for-$(uname -m)-baseos-eus-rpms" \
"rhel-9-for-$(uname -m)-appstream-eus-rpms"

# Copy the MicroShift repository contents
COPY ./rpm-repos/$USHIFT_RPM_REPO_NAME $USHIFT_RPM_REPO_PATH

Expand Down
10 changes: 10 additions & 0 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
Expand Up @@ -4,6 +4,16 @@ FROM registry.redhat.io/rhel9-eus/rhel-9.6-bootc:9.6
ARG USHIFT_RPM_REPO_NAME=microshift-local
ARG USHIFT_RPM_REPO_PATH=/tmp/$USHIFT_RPM_REPO_NAME

# Lock the OS release version and enable EUS repositories to prevent
# the installation of packages belonging to a newer OS release
# hadolint ignore=SC1091
RUN source /etc/os-release && \
echo "${VERSION_ID}" > /etc/dnf/vars/releasever && \
dnf config-manager --set-disabled '*' && \
dnf config-manager --set-enabled \
"rhel-9-for-$(uname -m)-baseos-eus-rpms" \
"rhel-9-for-$(uname -m)-appstream-eus-rpms"

# Copy the MicroShift repository contents
COPY ./rpm-repos/$USHIFT_RPM_REPO_NAME $USHIFT_RPM_REPO_PATH

Expand Down