USHIFT-6718: Update logic for previous major rollover

Author: pacevedom

scripts/auto-rebase/rebase_history.sh

@@ -22,10 +22,26 @@ show_details() {
     echo
 }
 
-SOURCE_VERSION=$(awk '{print $3}' Makefile.version.aarch64.var | cut -f1 -d-)
-MINOR_VERSION=$(echo "${SOURCE_VERSION}" | cut -f2 -d.)
-PREVIOUS_MINOR_VERSION=$(( "${MINOR_VERSION}" - 1 ))
-PREVIOUS_RELEASE_BRANCH="origin/release-4.${PREVIOUS_MINOR_VERSION}"
+SOURCE_VERSION=$(grep '^OCP_VERSION' Makefile.version.aarch64.var | cut -d'=' -f2 | tr -d ' ' | cut -d'-' -f1)
+MAJOR_VERSION=$(echo "${SOURCE_VERSION}" | cut -d'.' -f1)
+MINOR_VERSION=$(echo "${SOURCE_VERSION}" | cut -d'.' -f2)
+
+# Calculate previous version, handling cross-major boundaries (e.g., 5.0 -> 4.22)
+if (( MINOR_VERSION > 0 )); then
+    PREVIOUS_MAJOR_VERSION="${MAJOR_VERSION}"
+    PREVIOUS_MINOR_VERSION=$(( MINOR_VERSION - 1 ))
+else
+    # Cross-major boundary: map of last minor version for each major
+    declare -A LAST_MINOR_FOR_MAJOR=([4]=22)
+    PREVIOUS_MAJOR_VERSION=$(( MAJOR_VERSION - 1 ))
+    PREVIOUS_MINOR_VERSION="${LAST_MINOR_FOR_MAJOR[${PREVIOUS_MAJOR_VERSION}]:-}"
+    if [[ -z "${PREVIOUS_MINOR_VERSION}" ]]; then
+        echo "ERROR: No last minor version defined for major ${PREVIOUS_MAJOR_VERSION}" >&2
+        exit 1
+    fi
+fi
+
+PREVIOUS_RELEASE_BRANCH="origin/release-${PREVIOUS_MAJOR_VERSION}.${PREVIOUS_MINOR_VERSION}"
 FIRST_RELEASE_COMMIT=$(branch_start "${PREVIOUS_RELEASE_BRANCH}")
 
 mkdir -p _output
@@ -36,7 +52,7 @@ COMMIT_LIST=_output/commit_list.txt
 echo "Getting the list of changes since ${PREVIOUS_RELEASE_BRANCH} was created..."
 git log --date-order --reverse --pretty=format:"%H %s" "${FIRST_RELEASE_COMMIT}"..origin/main scripts/auto-rebase/changelog.txt >"${COMMIT_LIST}"
 
-HISTORY_FILE="_output/rebase_history_4_${MINOR_VERSION}.txt"
+HISTORY_FILE="_output/rebase_history_${MAJOR_VERSION}_${MINOR_VERSION}.txt"
 rm -f "${HISTORY_FILE}"
 # shellcheck disable=SC2162
 while read commit summary; do

scripts/devenv-builder/configure-vm.sh

@@ -196,6 +196,23 @@ function configure_rhel_repositories() {
     # Extract major version from Makefile.version
     local -r ocp_major="$(grep '^OCP_VERSION' "${MAKE_VERSION}" | cut -d'=' -f2 | tr -d ' ' | cut -d'.' -f1)"
 
+    # Map of last minor version for each major (for cross-major transitions)
+    local -A last_minor_for_major=([4]=22)
+
+    # Calculate previous version handling cross-major boundaries
+    # Sets prev_major and prev_minor variables
+    get_prev_version() {
+        local major=$1
+        local minor=$2
+        if (( minor > 0 )); then
+            prev_major="${major}"
+            prev_minor=$(( minor - 1 ))
+        else
+            prev_major=$(( major - 1 ))
+            prev_minor="${last_minor_for_major[${prev_major}]:-}"
+        fi
+    }
+
     RHOCP=$("${RHOCP_REPO}")
     if [[ "${RHOCP}" =~ ^[0-9]{1,2}$ ]]; then
         sudo subscription-manager repos --enable "rhocp-${ocp_major}.${RHOCP}-for-rhel-9-$(uname -m)-rpms"
@@ -211,14 +228,21 @@ enabled=1
 gpgcheck=0
 skip_if_unavailable=0
 EOF
-        PREVIOUS_RHOCP=$("${RHOCP_REPO}" $((ver-1)))
-        if [[ "${PREVIOUS_RHOCP}" =~ ^[0-9]{1,2}$ ]]; then
-            sudo subscription-manager repos --enable "rhocp-${ocp_major}.${PREVIOUS_RHOCP}-for-rhel-9-$(uname -m)-rpms"
-        else
-            # If RHOCP Y-1 is not available, try RHOCP Y-2.
-            Y2_RHOCP=$("${RHOCP_REPO}" $((ver-2)))
-            if [[ "${Y2_RHOCP}" =~ ^[0-9]{1,2}$ ]]; then
-                sudo subscription-manager repos --enable "rhocp-${ocp_major}.${Y2_RHOCP}-for-rhel-9-$(uname -m)-rpms"
+        # Calculate Y-1 version
+        get_prev_version "${ocp_major}" "${ver}"
+        if [[ -n "${prev_minor}" ]]; then
+            PREVIOUS_RHOCP=$("${RHOCP_REPO}" "${prev_minor}")
+            if [[ "${PREVIOUS_RHOCP}" =~ ^[0-9]{1,2}$ ]]; then
+                sudo subscription-manager repos --enable "rhocp-${prev_major}.${PREVIOUS_RHOCP}-for-rhel-9-$(uname -m)-rpms"
+            else
+                # If RHOCP Y-1 is not available, try RHOCP Y-2.
+                get_prev_version "${prev_major}" "${prev_minor}"
+                if [[ -n "${prev_minor}" ]]; then
+                    Y2_RHOCP=$("${RHOCP_REPO}" "${prev_minor}")
+                    if [[ "${Y2_RHOCP}" =~ ^[0-9]{1,2}$ ]]; then
+                        sudo subscription-manager repos --enable "rhocp-${prev_major}.${Y2_RHOCP}-for-rhel-9-$(uname -m)-rpms"
+                    fi
+                fi
             fi
         fi
     fi
@@ -280,7 +304,7 @@ function install_openshift_clients() {
         OCP_MINOR="$(grep '^OCP_VERSION' "${MAKE_VERSION}" | cut -d'=' -f2 | tr -d ' ' | cut -d'.' -f2)"
         OCPVERSION="${OCP_MAJOR}.${OCP_MINOR}"
         OCC_SRC="https://mirror.openshift.com/pub/openshift-v${OCP_MAJOR}/$(uname -m)/dependencies/rpms/${OCPVERSION}-el9-beta"
-        OCC_RPM="$(curl -s "${OCC_SRC}/" | grep -o "openshift-clients-4[^\"']*.rpm" | sort | uniq)"
+        OCC_RPM="$(curl -s "${OCC_SRC}/" | grep -o "openshift-clients-${OCP_MAJOR}[^\"']*.rpm" | sort | uniq)"
         OCC_LOC="$(mktemp /tmp/openshift-client-XXXXX.rpm)"
         OCC_REM="${OCC_SRC}/${OCC_RPM}"
 

scripts/release-notes/common.py

@@ -68,6 +68,44 @@ def get_version_from_makefile():
     return major, minor
 
 
+# Map of last minor version for each major version (for cross-major transitions).
+# When moving from X.0 to previous version, we need to know X-1's last minor.
+LAST_MINOR_FOR_MAJOR = {
+    4: 22
+}
+
+
+def get_previous_version(major, minor):
+    """
+    Calculate the previous version (Y-1) handling cross-major boundaries.
+
+    When minor > 0, the previous version is simply (major, minor-1).
+    When minor == 0, the previous version crosses to the prior major,
+    using LAST_MINOR_FOR_MAJOR to determine the last minor of that major.
+
+    Args:
+        major (int or str): The major version number.
+        minor (int or str): The minor version number.
+
+    Returns:
+        tuple: (previous_major, previous_minor) as strings.
+
+    Raises:
+        KeyError: If the previous major version is not defined in LAST_MINOR_FOR_MAJOR.
+    """
+    major_int = int(major)
+    minor_int = int(minor)
+
+    if minor_int > 0:
+        return (str(major_int), str(minor_int - 1))
+
+    prev_major = major_int - 1
+    if prev_major not in LAST_MINOR_FOR_MAJOR:
+        raise KeyError(f"Major version {prev_major} not found in LAST_MINOR_FOR_MAJOR. "
+                       f"Please add it with the last minor version.")
+    return (str(prev_major), str(LAST_MINOR_FOR_MAJOR[prev_major]))
+
+
 def redact(input):
     if GITHUB_TOKEN == "":
         return input

scripts/release-notes/gen_gh_releases_from_mirror.py

@@ -105,17 +105,18 @@ def main():
     # We build a default list of versions to scan using the current
     # version and the previous version. This assumes the script is run
     # out of the main branch where we can find the most current
-    # version under development. During the period where 4.n is being
-    # developed, 4.n-1 may still be producing only release candidates,
+    # version under development. During the period where X.n is being
+    # developed, X.n-1 may still be producing only release candidates,
     # so that scanning those 2 versions give us the 2 most recent
     # candidates for having no releases. During the period where the
     # main branch has not landed a rebase to update the version and
     # both main and the pre-release branch have the same version, we
-    # will end up scanning for EC or RC releases of 4.n-2, but that's
+    # will end up scanning for EC or RC releases of X.n-2, but that's
     # OK because the should all have been tagged already.
+    prev_major, prev_minor = common.get_previous_version(major, minor)
     versions_to_scan = [
         '.'.join([major, minor]),              # this minor version
-        '.'.join([major, str(int(minor)-1)]),  # the previous minor version
+        '.'.join([prev_major, prev_minor]),    # the previous minor version
     ]
 
     parser = argparse.ArgumentParser(

scripts/release-notes/gen_gh_releases_from_rhocp.py

@@ -50,7 +50,8 @@ def get_rpm_releases():
         # Try to add current-1 (continuing example from above, it'd be 4.20).
         # This is separate because DNF does not query remote repos in order, so enabling not active repo can derail whole cache update.
         try:
-            r = base.repos.get(f"rhocp-{current_major}.{int(current_minor)-1}-for-rhel-9-{arch}-rpms")
+            prev_major, prev_minor = common.get_previous_version(current_major, current_minor)
+            r = base.repos.get(f"rhocp-{prev_major}.{prev_minor}-for-rhel-9-{arch}-rpms")
             r.enable()
             logging.info(f'Enabled repo: {r.id} - {r.name}')
             base.fill_sack()

test/bin/build_images.sh

@@ -723,7 +723,7 @@ rm -f "${CONTAINER_LIST}"
 if ${EXTRACT_CONTAINER_IMAGES}; then
     extract_container_images "${SOURCE_VERSION}" "${LOCAL_REPO}" "${CONTAINER_LIST}"
     # The following images are specific to layers that use fake rpms built from source.
-    extract_container_images "4.${FAKE_NEXT_MINOR_VERSION}.*" "${NEXT_REPO}" "${CONTAINER_LIST}"
+    extract_container_images "${MAJOR_VERSION}.${FAKE_NEXT_MINOR_VERSION}.*" "${NEXT_REPO}" "${CONTAINER_LIST}"
     extract_container_images "${PREVIOUS_RELEASE_VERSION}" "${PREVIOUS_RELEASE_REPO}" "${CONTAINER_LIST}"
     extract_container_images "${YMINUS2_RELEASE_VERSION}" "${YMINUS2_RELEASE_REPO}" "${CONTAINER_LIST}"
     # The following images are specific to the brew release versions.

test/bin/scenario.sh

@@ -513,7 +513,7 @@ exit_if_image_not_set() {
 
 # Exit the script if microshift previous Z-stream version does not exist in rhocp repository
 exit_if_zprel_not_exist() {
-    local -r rhocp_repo="rhocp-4.${MINOR_VERSION}-for-rhel-9-${UNAME_M}-rpms"
+    local -r rhocp_repo="rhocp-${MAJOR_VERSION}.${MINOR_VERSION}-for-rhel-9-${UNAME_M}-rpms"
     local microshift_zprel
     if ! microshift_zprel="$(dnf repoquery -q --repo "${rhocp_repo}" --latest-limit 1 --nvr microshift 2>&1)"; then
         record_junit "repo ${rhocp_repo} does not exist or is not available: ${microshift_zprel}" "exit_if_zprel_not_exist" "SKIPPED"

test/scenarios/periodics/el96-prel@el98-src@upgrade-ok.sh

@@ -3,7 +3,7 @@
 # Sourced from scenario.sh and uses functions defined there.
 
 scenario_create_vms() {
-    prepare_kickstart host1 kickstart.ks.template "rhel-9.6-microshift-4.${PREVIOUS_MINOR_VERSION}"
+    prepare_kickstart host1 kickstart.ks.template "rhel-9.6-microshift-${PREVIOUS_MAJOR_VERSION}.${PREVIOUS_MINOR_VERSION}"
     launch_vm rhel-9.6
 }
 

test/scenarios/periodics/el96-yminus2@el98-src@upgrade-ok.sh

@@ -3,7 +3,7 @@
 # Sourced from scenario.sh and uses functions defined there.
 
 scenario_create_vms() {
-    prepare_kickstart host1 kickstart.ks.template "rhel-9.6-microshift-4.${YMINUS2_MINOR_VERSION}"
+    prepare_kickstart host1 kickstart.ks.template "rhel-9.6-microshift-${YMINUS2_MAJOR_VERSION}.${YMINUS2_MINOR_VERSION}"
     launch_vm rhel-9.6
 }
 

test/scenarios/presubmits/el96-prel@el98-src@upgrade-ok.sh

@@ -3,7 +3,7 @@
 # Sourced from scenario.sh and uses functions defined there.
 
 scenario_create_vms() {
-    prepare_kickstart host1 kickstart.ks.template "rhel-9.6-microshift-4.${PREVIOUS_MINOR_VERSION}"
+    prepare_kickstart host1 kickstart.ks.template "rhel-9.6-microshift-${PREVIOUS_MAJOR_VERSION}.${PREVIOUS_MINOR_VERSION}"
     launch_vm rhel-9.6
 }