Skip to content

USHIFT-6848: Disable default pre-release RHEL 9.8 and 10.2 repositories #6490

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 2 commits into from
Apr 12, 2026
Merged

USHIFT-6848: Disable default pre-release RHEL 9.8 and 10.2 repositories #6490

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
e3eafd3
Disable default pre-release RHEL 9.8 and 10.2 repositories
ggiguash Apr 12, 2026
d63e66f
The containernetworking-plugins package does not exist on rhel 10
ggiguash Apr 12, 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
6 changes: 4 additions & 2 deletions test/image-blueprints-bootc/layer1-base/group1/rhel102-test-agent.containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ FROM registry.stage.redhat.io/rhel10/rhel-bootc:10.2
ARG USHIFT_RPM_REPO_NAME=microshift-local
ARG USHIFT_RPM_REPO_PATH=/tmp/$USHIFT_RPM_REPO_NAME

# Configure the RPM repositories (no EUS in staging environment)
# Configure the RPM repositories
# - No EUS repositories in staging environment
# - Disable default repositories to avoid pre-release repo access errors
COPY --chmod=755 ./bootc-images/rpm-repo-config.sh /tmp/rpm-repo-config.sh
RUN /tmp/rpm-repo-config.sh && rm -f /tmp/rpm-repo-config.sh
RUN /tmp/rpm-repo-config.sh --disable-all && rm -f /tmp/rpm-repo-config.sh

# Configure the RHEL mirror RPM repositories (for use in the staging environment)
ARG RHEL_MIRROR_REPO_NAME=rhel102-mirror.repo
Expand Down
6 changes: 4 additions & 2 deletions test/image-blueprints-bootc/layer1-base/group1/rhel98-test-agent.containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ FROM registry.stage.redhat.io/rhel9/rhel-bootc:9.8
ARG USHIFT_RPM_REPO_NAME=microshift-local
ARG USHIFT_RPM_REPO_PATH=/tmp/$USHIFT_RPM_REPO_NAME

# Configure the RPM repositories (no EUS in staging environment)
# Configure the RPM repositories
# - No EUS repositories in staging environment
# - Disable default repositories to avoid pre-release repo access errors
COPY --chmod=755 ./bootc-images/rpm-repo-config.sh /tmp/rpm-repo-config.sh
RUN /tmp/rpm-repo-config.sh && rm -f /tmp/rpm-repo-config.sh
RUN /tmp/rpm-repo-config.sh --disable-all && rm -f /tmp/rpm-repo-config.sh

# Configure the RHEL mirror RPM repositories (for use in the staging environment)
ARG RHEL_MIRROR_REPO_NAME=rhel98-mirror.repo
Expand Down
5 changes: 1 addition & 4 deletions test/image-blueprints-bootc/layer4-release/group2/rhel102-bootc-brew-lrel-fips.containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@ match-architectures = ["x86_64"]
EOF

# Enable the FIPS crypto policy
#
# Note: CNI plugins are required for podman to operate normally on RHEL 9.x.
# This package is no longer installed as cri-o dependency.
RUN dnf install -y crypto-policies-scripts containernetworking-plugins && \
RUN dnf install -y crypto-policies-scripts && \
update-crypto-policies --no-reload --set FIPS && \
dnf clean all
# {{- end -}}
4 changes: 4 additions & 0 deletions test/image-blueprints-bootc/templates/rpm-repo-config.sh.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ while [ $# -gt 0 ] ; do
enable_eus_repositories
shift
;;
--disable-all)
dnf config-manager --set-disabled '*'
shift
;;
*)
echo "Unknown option: $1"
exit 1
Expand Down