USHIFT-6718: Update release notes scripts

Author: pacevedom

scripts/release-notes/gen_gh_releases_from_mirror.py

@@ -60,8 +60,11 @@
 
 logging.basicConfig(level=logging.DEBUG, format='%(asctime)s %(levelname)-8s [%(filename)s:%(lineno)d] %(message)s')
 
-URL_BASE = "https://mirror.openshift.com/pub/openshift-v4/aarch64/microshift"
-URL_BASE_X86 = "https://mirror.openshift.com/pub/openshift-v4/x86_64/microshift"
+
+def get_mirror_url_base(major_version, arch):
+    """Get the mirror URL base for the given major version and architecture."""
+    return f"https://mirror.openshift.com/pub/openshift-v{major_version}/{arch}/microshift"
+
 
 # An EC RPM filename looks like
 # microshift-4.13.0~ec.4-202303070857.p0.gcf0bce2.assembly.ec.4.el9.aarch64.rpm
@@ -167,13 +170,22 @@ def main():
     if args.versions_to_scan:
         versions_to_scan = args.versions_to_scan
 
+    # Group versions by major to use correct mirror URL bases
+    versions_by_major = {}
+    for version in versions_to_scan:
+        scan_major = version.split('.', 1)[0]
+        versions_by_major.setdefault(scan_major, []).append(version)
+
     new_releases = []
-    if args.ec:
-        new_releases.extend(find_new_releases(versions_to_scan, URL_BASE, 'ocp-dev-preview'))
-        new_releases.extend(find_new_releases(versions_to_scan, URL_BASE_X86, 'ocp-dev-preview'))
-    if args.rc:
-        new_releases.extend(find_new_releases(versions_to_scan, URL_BASE, 'ocp'))
-        new_releases.extend(find_new_releases(versions_to_scan, URL_BASE_X86, 'ocp'))
+    for scan_major, scan_versions in versions_by_major.items():
+        url_base_aarch64 = get_mirror_url_base(scan_major, 'aarch64')
+        url_base_x86 = get_mirror_url_base(scan_major, 'x86_64')
+        if args.ec:
+            new_releases.extend(find_new_releases(scan_versions, url_base_aarch64, 'ocp-dev-preview'))
+            new_releases.extend(find_new_releases(scan_versions, url_base_x86, 'ocp-dev-preview'))
+        if args.rc:
+            new_releases.extend(find_new_releases(scan_versions, url_base_aarch64, 'ocp'))
+            new_releases.extend(find_new_releases(scan_versions, url_base_x86, 'ocp'))
 
     if not new_releases:
         logging.info("No new releases found.")
@@ -194,7 +206,7 @@ def main():
 class VersionListParser(html.parser.HTMLParser):
     """HTMLParser to extract version numbers from the mirror file list pages.
 
-    A page like https://mirror.openshift.com/pub/openshift-v4/aarch64/microshift/ocp-dev-preview/
+    A page like https://mirror.openshift.com/pub/openshift-v{major}/aarch64/microshift/ocp-dev-preview/
 
     contains HTML like
 
@@ -355,20 +367,25 @@ def publish_candidate_release(new_release, take_action):
     candidate_number = new_release.candidate_number
     release_type = new_release.release_type
 
+    # Extract major version from product version (e.g., "4" from "4.16.0")
+    major_version = product_version.split('.')[0]
+    url_base_x86 = get_mirror_url_base(major_version, 'x86_64')
+    url_base_aarch64 = get_mirror_url_base(major_version, 'aarch64')
+
     # Set up the release notes preamble with download links
     preamble = textwrap.dedent(f"""
     This is a candidate release for {product_version}.
 
     See the mirror for build artifacts:
-    - {URL_BASE_X86}/{release_type}/{product_version}-{candidate_type}.{candidate_number}/
-    - {URL_BASE}/{release_type}/{product_version}-{candidate_type}.{candidate_number}/
+    - {url_base_x86}/{release_type}/{product_version}-{candidate_type}.{candidate_number}/
+    - {url_base_aarch64}/{release_type}/{product_version}-{candidate_type}.{candidate_number}/
 
     Or add this RPM repository to your x86 systems:
 
     ```
     [microshift-{product_version}-{candidate_type}-{candidate_number}]
     name=MicroShift {product_version} EarlyAccess {candidate_type}.{candidate_number} RPMs
-    baseurl={URL_BASE_X86}/{release_type}/{product_version}-{candidate_type}.{candidate_number}/el9/os/
+    baseurl={url_base_x86}/{release_type}/{product_version}-{candidate_type}.{candidate_number}/el9/os/
     enabled=1
     gpgcheck=0
     skip_if_unavailable=0
@@ -379,7 +396,7 @@ def publish_candidate_release(new_release, take_action):
     ```
     [microshift-{product_version}-{candidate_type}-{candidate_number}]
     name=MicroShift {product_version} EarlyAccess {candidate_type}.{candidate_number} RPMs
-    baseurl={URL_BASE}/{release_type}/{product_version}-{candidate_type}.{candidate_number}/el9/os/
+    baseurl={url_base_aarch64}/{release_type}/{product_version}-{candidate_type}.{candidate_number}/el9/os/
     enabled=1
     gpgcheck=0
     skip_if_unavailable=0

scripts/release-notes/gen_gh_releases_from_rhocp.py

@@ -26,7 +26,7 @@ def get_rpm_releases():
     """Gets the releases from the released MicroShift RPMs in the RHOCP repositories.
     """
     arch = platform.machine()
-    _, current_minor = common.get_version_from_makefile()
+    current_major, current_minor = common.get_version_from_makefile()
 
     with dnf.Base() as base:
         base.read_all_repos()
@@ -36,8 +36,10 @@ def get_rpm_releases():
 
         # Enable RHOCP repos starting from 4.14 to the current-2 (inclusive; range() stops before the second argument).
         # E.g., for 4.21 it's 4.14-4.19 because when 4.21 development started, the 4.20 wasn't released yet.
-        for minor in range(14, int(current_minor)-1):
-            repo_id = f"rhocp-4.{minor}-for-rhel-9-{arch}-rpms"
+        # For major version 5, start from 5.0; for major version 4, start from 4.14.
+        start_minor = 0 if int(current_major) >= 5 else 14
+        for minor in range(start_minor, int(current_minor)-1):
+            repo_id = f"rhocp-{current_major}.{minor}-for-rhel-9-{arch}-rpms"
             r = base.repos.get_matching(repo_id)
             r.enable()
             logging.info(f'Enabled repo: {r.id} - {r.name}')
@@ -48,7 +50,7 @@ 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-4.{int(current_minor)-1}-for-rhel-9-{arch}-rpms")
+            r = base.repos.get(f"rhocp-{current_major}.{int(current_minor)-1}-for-rhel-9-{arch}-rpms")
             r.enable()
             logging.info(f'Enabled repo: {r.id} - {r.name}')
             base.fill_sack()