Fix configure-vm cross-major version logic

Author: pacevedom

scripts/devenv-builder/configure-vm.sh

@@ -218,18 +218,19 @@ function configure_rhel_repositories() {
         sudo subscription-manager repos --enable "rhocp-${ocp_major}.${RHOCP}-for-rhel-9-$(uname -m)-rpms"
     elif [[ "${RHOCP}" =~ ^http ]]; then
         url=$(echo "${RHOCP}" | cut -d, -f1)
-        ver=$(echo "${RHOCP}" | cut -d, -f2)
-        OCP_REPO_NAME="rhocp-${ocp_major}.${ver}-for-rhel-9-mirrorbeta-$(uname -i)-rpms"
+        major=$(echo "${RHOCP}" | cut -d, -f2)
+        ver=$(echo "${RHOCP}" | cut -d, -f3)
+        OCP_REPO_NAME="rhocp-${major}.${ver}-for-rhel-9-mirrorbeta-$(uname -i)-rpms"
         sudo tee "/etc/yum.repos.d/${OCP_REPO_NAME}.repo" >/dev/null <<EOF
 [${OCP_REPO_NAME}]
-name=Beta rhocp-${ocp_major}.${ver} RPMs for RHEL 9
+name=Beta rhocp-${major}.${ver} RPMs for RHEL 9
 baseurl=${url}
 enabled=1
 gpgcheck=0
 skip_if_unavailable=0
 EOF
         # Calculate Y-1 version
-        get_prev_version "${ocp_major}" "${ver}"
+        get_prev_version "${major}" "${ver}"
         if [[ -n "${prev_minor}" ]]; then
             PREVIOUS_RHOCP=$("${RHOCP_REPO}" "${prev_minor}" "${prev_major}")
             if [[ "${PREVIOUS_RHOCP}" =~ ^[0-9]{1,2}$ ]]; then

scripts/get-latest-rhocp-repo.sh

@@ -14,9 +14,9 @@
 #
 # Output is:
 # - just a minor version in case of subscription RHOCP repository, e.g.: 15
-# - or an URL to beta mirror followed by comma and minor version, e.g.:
-#   https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rpms/4.16-el9-beta/,16
-#   https://mirror.openshift.com/pub/openshift-v5/x86_64/dependencies/rpms/5.0-el9-beta/,0
+# - or an URL to beta mirror followed by comma, major, comma, and minor version, e.g.:
+#   https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rpms/4.16-el9-beta/,4,16
+#   https://mirror.openshift.com/pub/openshift-v5/x86_64/dependencies/rpms/5.0-el9-beta/,5,0
 
 set -euo pipefail
 
@@ -88,7 +88,7 @@ for (( step=0; step < max_steps; step++ )); do
 
     rhocp_beta_url="https://mirror.openshift.com/pub/openshift-v${check_major}/$(uname -m)/dependencies/rpms/${check_major}.${check_minor}-el9-beta/"
     if sudo dnf repository-packages --showduplicates --disablerepo '*' --repofrompath "this,${rhocp_beta_url}" this info cri-o 1>&2; then
-        echo "${rhocp_beta_url},${check_minor}"
+        echo "${rhocp_beta_url},${check_major},${check_minor}"
         exit 0
     fi