Skip to content

[release-4.20] USHIFT-6442: Introduce RPM repository configuration script #6095

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

Merged
openshift-merge-bot merged 4 commits into from
Jan 16, 2026
Merged

[release-4.20] USHIFT-6442: Introduce RPM repository configuration script #6095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3e56779
Add rpm repo configuration script to RHEL base images
ggiguash Jan 10, 2026
2e27155
Remove redundant rpm repo configuration from build-serialsim.sh script
ggiguash Jan 10, 2026
243ba97
Enable EUS repos for rhel-9.4 bootc images
ggiguash Jan 16, 2026
95c3943
Do not remove releasever in serialsim.sh script
ggiguash Jan 16, 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
10 changes: 6 additions & 4 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,16 +4,18 @@ 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

# Configure the RPM repositories (without EUS enabled)
COPY --chmod=755 ./bootc-images/rpm-repo-config.sh /tmp/rpm-repo-config.sh
RUN /tmp/rpm-repo-config.sh --enable-eus && rm -f /tmp/rpm-repo-config.sh

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

# Copy repository configuration
COPY ./bootc-images/$USHIFT_RPM_REPO_NAME.repo /etc/yum.repos.d/

# Print repository configuration contents.
# Install test agent and cleanup.
RUN dnf repoinfo --enabled && \
dnf install -y microshift-test-agent && \
# Install the test agent and cleanup
RUN dnf install -y microshift-test-agent && \
systemctl enable microshift-test-agent && \
rm -vf /etc/yum.repos.d/microshift-*.repo && \
rm -rvf $USHIFT_RPM_REPO_PATH && \
Expand Down
10 changes: 6 additions & 4 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,16 +4,18 @@ 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

# Configure the RPM repositories (with EUS enabled)
COPY --chmod=755 ./bootc-images/rpm-repo-config.sh /tmp/rpm-repo-config.sh
RUN /tmp/rpm-repo-config.sh --enable-eus && rm -f /tmp/rpm-repo-config.sh

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

# Copy repository configuration
COPY ./bootc-images/$USHIFT_RPM_REPO_NAME.repo /etc/yum.repos.d/

# Print repository configuration contents.
# Install test agent and cleanup.
RUN dnf repoinfo --enabled && \
dnf install -y microshift-test-agent && \
# Install the test agent and cleanup
RUN dnf install -y microshift-test-agent && \
systemctl enable microshift-test-agent && \
rm -vf /etc/yum.repos.d/microshift-*.repo && \
rm -rvf $USHIFT_RPM_REPO_PATH && \
Expand Down
35 changes: 35 additions & 0 deletions test/image-blueprints-bootc/layer1-base/group1/rpm-repo-config.sh.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
#!/bin/bash
set -euo pipefail
set -x

function enable_eus_repositories() {
local -r vmajor="$(awk -F. '{print $1}' <<< "${VERSION_ID}")"
local -r vminor="$(awk -F. '{print $2}' <<< "${VERSION_ID}")"

dnf config-manager --set-disabled '*'
dnf config-manager --set-enabled \
"rhel-${vmajor}-for-$(uname -m)-baseos-eus-rpms" \
"rhel-${vmajor}-for-$(uname -m)-appstream-eus-rpms"
}

# Lock the OS release version to prevent the installation of packages belonging
# to a newer OS release
source /etc/os-release
echo "${VERSION_ID}" > /etc/dnf/vars/releasever

# Process the command line arguments
while [ $# -gt 0 ] ; do
case "$1" in
--enable-eus)
enable_eus_repositories
shift
;;
*)
echo "Unknown option: $1"
exit 1
;;
esac
done

# Print the enabled repositories
dnf repoinfo --enabled
18 changes: 2 additions & 16 deletions test/image-blueprints-bootc/layer1-base/group2/build-serialsim.sh.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,12 @@ function get_kernel_ver() {
# Set the current kernel version and architecture variables.
get_kernel_ver

# Lock the OS release version to prevent the installation of a newer kernel package
# belonging to a newer OS release.
# On CentOS, attempt to install the kernel-devel package for the current kernel
# version, falling back to kernel-devel-matched if the former is not available.
source /etc/os-release
echo "${VERSION_ID}" > /etc/dnf/vars/releasever

if [[ "${ID}" == "rhel" ]] ; then
# On RHEL, enable RHEL EUS repositories to allow the installation of the
# kernel-devel package for the current kernel version.
VERSION_ID_MAJOR="$(awk -F. '{print $1}' <<< "${VERSION_ID}")"
VERSION_ID_MINOR="$(awk -F. '{print $2}' <<< "${VERSION_ID}")"
if (( "${VERSION_ID_MINOR}" % 2 == 0 )) ; then
dnf config-manager --set-enabled \
"rhel-${VERSION_ID_MAJOR}-for-$(uname -m)-baseos-eus-rpms" \
"rhel-${VERSION_ID_MAJOR}-for-$(uname -m)-appstream-eus-rpms"
fi
dnf install -y "kernel-devel-${KERNEL_VER}"
else
# On CentOS, attempt to install the kernel-devel package for the current kernel
# version, falling back to kernel-devel-matched if the former is not available.
dnf install -y "kernel-devel-${KERNEL_VER}" || dnf install -y kernel-devel-matched
fi

Expand All @@ -41,7 +28,6 @@ get_kernel_ver
# Install the necessary dependencies and clean up.
dnf install -y git make python3-pyserial
dnf clean all
rm -f /etc/dnf/vars/releasever

# Clone the serialsim repository and build the serialsim module.
git clone https://github.com/pmtk/serialsim.git /tmp/serialsim
Expand Down