Skip to content

Commit e3eafd3

Browse files
committed
Disable default pre-release RHEL 9.8 and 10.2 repositories
1 parent 7b2121a commit e3eafd3

3 files changed

Lines changed: 12 additions & 4 deletions

File tree

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@ FROM registry.stage.redhat.io/rhel10/rhel-bootc:10.2
44
ARG USHIFT_RPM_REPO_NAME=microshift-local
55
ARG USHIFT_RPM_REPO_PATH=/tmp/$USHIFT_RPM_REPO_NAME
66

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

1113
# Configure the RHEL mirror RPM repositories (for use in the staging environment)
1214
ARG RHEL_MIRROR_REPO_NAME=rhel102-mirror.repo

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@ FROM registry.stage.redhat.io/rhel9/rhel-bootc:9.8
44
ARG USHIFT_RPM_REPO_NAME=microshift-local
55
ARG USHIFT_RPM_REPO_PATH=/tmp/$USHIFT_RPM_REPO_NAME
66

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

1113
# Configure the RHEL mirror RPM repositories (for use in the staging environment)
1214
ARG RHEL_MIRROR_REPO_NAME=rhel98-mirror.repo

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ while [ $# -gt 0 ] ; do
2424
enable_eus_repositories
2525
shift
2626
;;
27+
--disable-all)
28+
dnf config-manager --set-disabled '*'
29+
shift
30+
;;
2731
*)
2832
echo "Unknown option: $1"
2933
exit 1

0 commit comments

Comments
 (0)