From f67b8c84d58cc7a93a9d4510d42cd69491e793ec Mon Sep 17 00:00:00 2001 From: Jon Cope Date: Tue, 11 Jun 2024 12:24:51 -0500 Subject: [PATCH] reenable those scenarios which depend on 4.17 rpms being present in the public mirror Signed-off-by: Jon Cope --- .../includes/post-cos9rpm.cfg | 20 ++++++++++--------- ...pending_crel => cos9-src@rpm-standard1.sh} | 0 ...pending_crel => cos9-src@rpm-standard2.sh} | 0 ..._crel => el94-crel@el94-src@upgrade-ok.sh} | 0 4 files changed, 11 insertions(+), 9 deletions(-) rename test/scenarios-periodics/{cos9-src@rpm-standard1.sh.pending_crel => cos9-src@rpm-standard1.sh} (100%) rename test/scenarios-periodics/{cos9-src@rpm-standard2.sh.pending_crel => cos9-src@rpm-standard2.sh} (100%) rename test/scenarios/{el94-crel@el94-src@upgrade-ok.sh.pending_crel => el94-crel@el94-src@upgrade-ok.sh} (100%) diff --git a/test/kickstart-templates/includes/post-cos9rpm.cfg b/test/kickstart-templates/includes/post-cos9rpm.cfg index 2e0a8d4123..43f3591494 100644 --- a/test/kickstart-templates/includes/post-cos9rpm.cfg +++ b/test/kickstart-templates/includes/post-cos9rpm.cfg @@ -21,17 +21,19 @@ EOF # The openshift-client dependency from OpenShift Mirror # Only the released previous minor version is guaranteed to be available +# Excludes all to avoid unintentionally sourcing packages from here that +# should come from a centos repos. OCPVERSION=4.REPLACE_PREVIOUS_MINOR_VERSION -# Do not remove the trailing slash in the URL or some downloads -# may fail depending on a region -OCC_SRC="https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/dependencies/rpms/${OCPVERSION}-el9-beta/" -OCC_LOC="$(mktemp -d /tmp/openshift-client-XXXXXXXX)" +OCPREPO="openshift-${OCPVERSION}-mirror" +cat > "/etc/yum.repos.d/${OCPREPO}.repo" <