From 1aeac32d14477a22293564aac2debaad3ef35a11 Mon Sep 17 00:00:00 2001 From: Pablo Acevedo Montserrat Date: Tue, 26 May 2026 09:19:28 +0200 Subject: [PATCH] USHIFT-7042: Enable EUS repos for RHEL 9.4 and 9.6 bootc test images The bootc base images ship with repos pointing to RHEL 9 latest content instead of EUS. This causes dnf to install greenboot-rs (0.16.x) instead of bash greenboot (0.15.x). Greenboot-rs sets RefuseManualStartStop=yes on greenboot-healthcheck.service, breaking both the test framework's Restart Greenboot keyword and the rollback/reboot mechanism. Lock releasever and enable EUS repositories before installing packages, matching the pattern used on release-4.20+ via rpm-repo-config.sh. --- .../layer1-base/group1/rhel94-test-agent.containerfile | 10 ++++++++++ .../layer1-base/group1/rhel96-test-agent.containerfile | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/test/image-blueprints-bootc/layer1-base/group1/rhel94-test-agent.containerfile b/test/image-blueprints-bootc/layer1-base/group1/rhel94-test-agent.containerfile index 0f675e600a..5e6d491e90 100644 --- a/test/image-blueprints-bootc/layer1-base/group1/rhel94-test-agent.containerfile +++ b/test/image-blueprints-bootc/layer1-base/group1/rhel94-test-agent.containerfile @@ -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 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 0fb3dc0573..58195bd997 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 @@ -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