USHIFT-4129: Update common_versions.sh with 4.17 repos

openshift · Oct 17, 2024 · 09a8523 · 09a8523
1 parent 58f725f
commit 09a8523
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/test/bin/common_versions.sh b/test/bin/common_versions.sh
@@ -47,8 +47,8 @@ export FAKE_NEXT_MINOR_VERSION=$(( "${MINOR_VERSION}" + 1 ))
 #
 # For a release branch, the current release repository should come from the
 # official 'rhocp' stream.
-CURRENT_RELEASE_REPO="https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/microshift/ocp/latest-4.17/el9/os"
-CURRENT_RELEASE_VERSION="$(get_vrel_from_beta "${CURRENT_RELEASE_REPO}")"
+CURRENT_RELEASE_REPO="rhocp-4.17-for-rhel-9-$(uname -m)-rpms"
+CURRENT_RELEASE_VERSION="$(get_vrel_from_rhsm "${CURRENT_RELEASE_REPO}")"
 export CURRENT_RELEASE_REPO
 export CURRENT_RELEASE_VERSION
 
@@ -73,10 +73,11 @@ YMINUS2_RELEASE_VERSION="$(get_vrel_from_rhsm "${YMINUS2_RELEASE_REPO}")"
 export YMINUS2_RELEASE_REPO
 export YMINUS2_RELEASE_VERSION
 
-# Define either a release version or the OpenShift mirror beta repository URL.
+# Define a release version and/or the OpenShift mirror beta repository URL.
 # If the release version is defined, the repository should be deduced from the
 # CURRENT_RELEASE_REPO setting.
-RHOCP_MINOR_Y=""
+# Beta repository URL needs to be set for CentOS images as they don't have access to the RHOCP.
+RHOCP_MINOR_Y=17
 RHOCP_MINOR_Y_BETA="https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/dependencies/rpms/4.17-el9-beta/"
 export RHOCP_MINOR_Y
 export RHOCP_MINOR_Y_BETA