Merge pull request #6490 from ggiguash/rhel-disable-prerelease-repos

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

Author: openshift-merge-bot[bot]

test/image-blueprints-bootc/layer1-base/group1/rhel102-test-agent.containerfile

@@ -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

test/image-blueprints-bootc/layer1-base/group1/rhel98-test-agent.containerfile

@@ -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

test/image-blueprints-bootc/layer4-release/group2/rhel102-bootc-brew-lrel-fips.containerfile

@@ -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 -}}

test/image-blueprints-bootc/templates/rpm-repo-config.sh.template

@@ -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