WIP major version changes for test framework

scripts/devenv-builder/configure-vm.sh

@@ -193,29 +193,32 @@ function configure_rhel_subscription() {
 function configure_rhel_repositories() {
     sudo subscription-manager config --rhsm.manage_repos=1
 
+    # Extract major version from Makefile.version
+    local -r ocp_major="$(grep '^OCP_VERSION' "${MAKE_VERSION}" | cut -d'=' -f2 | tr -d ' ' | cut -d'.' -f1)"
+
     RHOCP=$("${RHOCP_REPO}")
-    if [[ "${RHOCP}" =~ ^[0-9]{2} ]]; then
-        sudo subscription-manager repos --enable "rhocp-4.${RHOCP}-for-rhel-9-$(uname -m)-rpms"
+    if [[ "${RHOCP}" =~ ^[0-9]{1,2}$ ]]; then
+        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-4.${ver}-for-rhel-9-mirrorbeta-$(uname -i)-rpms"
+        OCP_REPO_NAME="rhocp-${ocp_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-4.${ver} RPMs for RHEL 9
+name=Beta rhocp-${ocp_major}.${ver} RPMs for RHEL 9
 baseurl=${url}
 enabled=1
 gpgcheck=0
 skip_if_unavailable=0
 EOF
         PREVIOUS_RHOCP=$("${RHOCP_REPO}" $((ver-1)))
-        if [[ "${PREVIOUS_RHOCP}" =~ ^[0-9]{2} ]]; then
-            sudo subscription-manager repos --enable "rhocp-4.${PREVIOUS_RHOCP}-for-rhel-9-$(uname -m)-rpms"
+        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]{2} ]]; then
-                sudo subscription-manager repos --enable "rhocp-4.${Y2_RHOCP}-for-rhel-9-$(uname -m)-rpms"
+            if [[ "${Y2_RHOCP}" =~ ^[0-9]{1,2}$ ]]; then
+                sudo subscription-manager repos --enable "rhocp-${ocp_major}.${Y2_RHOCP}-for-rhel-9-$(uname -m)-rpms"
             fi
         fi
     fi
@@ -273,8 +276,10 @@ function install_openshift_clients() {
         "${DNF_RETRY}" "install" "openshift-clients"
     else
         # Assume the current development version on non-RHEL OS
-        OCPVERSION="4.$(cut -d'.' -f2 "${MAKE_VERSION}")"
-        OCC_SRC="https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/dependencies/rpms/${OCPVERSION}-el9-beta"
+        OCP_MAJOR="$(cut -d'.' -f1 "${MAKE_VERSION}")"
+        OCP_MINOR="$(cut -d'.' -f2 "${MAKE_VERSION}")"
+        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_LOC="$(mktemp /tmp/openshift-client-XXXXX.rpm)"
         OCC_REM="${OCC_SRC}/${OCC_RPM}"

scripts/get-latest-rhocp-repo.sh

@@ -14,6 +14,7 @@
 # - 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
 
 set -euo pipefail
 
@@ -25,39 +26,41 @@ if ! sudo subscription-manager status >&/dev/null; then
     exit 1
 fi
 
+# Get version of currently checked out branch.
+# It's based on values stored in Makefile.version.$ARCH.var.
+make_version="${REPOROOT}/Makefile.version.$(uname -m).var"
+if [ ! -f "${make_version}" ] ; then
+    # Attempt to locate the Makefile version file next to the current script.
+    # This is necessary when bootstrapping the development environment for the first time.
+    make_version=$(find "${SCRIPTDIR}" -maxdepth 1 -name "Makefile.version.$(uname -m).*.var" | tail -1)
+    if [ ! -f "${make_version}" ] ; then
+        >&2 echo "Cannot find the Makefile.version.$(uname -m).var file"
+        exit 1
+    fi
+fi
+current_major=$(grep '^OCP_VERSION' "${make_version}" | cut -d'=' -f2 | tr -d ' ' | cut -d'.' -f1)
+
 if [[ "$#" -eq 1 ]]; then
     current_minor="${1}"
     stop="${current_minor}"
 else
-    # Get minor version of currently checked out branch.
-    # It's based on values stored in Makefile.version.$ARCH.var.
-    make_version="${REPOROOT}/Makefile.version.$(uname -m).var"
-    if [ ! -f "${make_version}" ] ; then
-        # Attempt to locate the Makefile version file next to the current script.
-        # This is necessary when bootstrapping the development environment for the first time.
-        make_version=$(find "${SCRIPTDIR}" -maxdepth 1 -name "Makefile.version.$(uname -m).*.var" | tail -1)
-        if [ ! -f "${make_version}" ] ; then
-            >&2 echo "Cannot find the Makefile.version.$(uname -m).var file"
-            exit 1
-        fi
-    fi
-    current_minor=$(cut -d'.' -f2 "${make_version}")
+    current_minor=$(grep '^OCP_VERSION' "${make_version}" | cut -d'=' -f2 | tr -d ' ' | cut -d'.' -f2)
     stop=$(( current_minor - 3 ))
 fi
 
-# Go through minor versions, starting from current_mirror counting down
+# Go through minor versions, starting from current_minor counting down
 # to get latest available rhocp repository.
-# For example, at the time of writing this comment, current_minor is 16,
-# and following code will try to access rhocp-4.15 (which is not released yet)
-# and then rhocp-4.14 (which will be returned from the script because it's usable).
+# For example, if current version is 4.16, the code will try to access
+# rhocp-4.15 (which may not be released yet) and then rhocp-4.14 (which
+# will be returned if it's usable). Works similarly for version 5.x.
 for ver in $(seq "${current_minor}" -1 "${stop}"); do
-    repository="rhocp-4.${ver}-for-rhel-9-$(uname -m)-rpms"
+    repository="rhocp-${current_major}.${ver}-for-rhel-9-$(uname -m)-rpms"
     if sudo dnf repository-packages --showduplicates "${repository}" info cri-o 1>&2; then
         echo "${ver}"
         exit 0
     fi
 
-    rhocp_beta_url="https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/dependencies/rpms/4.${ver}-el9-beta/"
+    rhocp_beta_url="https://mirror.openshift.com/pub/openshift-v${current_major}/$(uname -m)/dependencies/rpms/${current_major}.${ver}-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},${ver}"
         exit 0

scripts/release-notes/gen_gh_releases_from_mirror.py

@@ -60,8 +60,10 @@
 
 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 +169,17 @@ def main():
     if args.versions_to_scan:
         versions_to_scan = args.versions_to_scan
 
+    # Get URL bases for the current major version
+    url_base_aarch64 = get_mirror_url_base(major, 'aarch64')
+    url_base_x86 = get_mirror_url_base(major, 'x86_64')
+
     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'))
+        new_releases.extend(find_new_releases(versions_to_scan, url_base_aarch64, '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'))
+        new_releases.extend(find_new_releases(versions_to_scan, url_base_aarch64, 'ocp'))
+        new_releases.extend(find_new_releases(versions_to_scan, url_base_x86, 'ocp'))
 
     if not new_releases:
         logging.info("No new releases found.")
@@ -194,7 +200,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 +361,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 +390,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()

test/assets/common_versions.sh.template

@@ -68,11 +68,14 @@ get_vrel_from_rpm() {{
     echo ""
 }}
 
-# The current release minor version (e.g. '17' for '4.17') affects
+# The current release version (e.g. '4.17') affects
 # the definition of previous and fake next versions.
+export MAJOR_VERSION={major_version}
 export MINOR_VERSION={minor_version}
-export PREVIOUS_MINOR_VERSION=$(( "${{MINOR_VERSION}}" - 1 ))
-export YMINUS2_MINOR_VERSION=$(( "${{MINOR_VERSION}}" - 2 ))
+export PREVIOUS_MAJOR_VERSION={previous_major_version}
+export PREVIOUS_MINOR_VERSION={previous_minor_version}
+export YMINUS2_MAJOR_VERSION={yminus2_major_version}
+export YMINUS2_MINOR_VERSION={yminus2_minor_version}
 export FAKE_NEXT_MINOR_VERSION=$(( "${{MINOR_VERSION}}" + 1 ))
 
 # For a main branch, the current release repository usually comes from
@@ -110,27 +113,34 @@ YMINUS2_RELEASE_VERSION="{yminus2_release_version}"
 export YMINUS2_RELEASE_REPO
 export YMINUS2_RELEASE_VERSION
 
-# The 'rhocp_minor_y' variable should be the minor version number, if the
-# current release is available through the 'rhocp' stream, otherwise empty.
+# The 'rhocp_major_y' and 'rhocp_minor_y' variables should be the major and minor
+# version numbers, if the current release is available through the 'rhocp' stream,
+# otherwise empty.
+RHOCP_MAJOR_Y={rhocp_major_y}
 RHOCP_MINOR_Y={rhocp_minor_y}
 # The beta repository, containing dependencies, should point to the
 # OpenShift mirror URL. If the mirror for current minor is not
 # available yet, it should point to an older release.
 RHOCP_MINOR_Y_BETA="{rhocp_minor_y_beta}"
+export RHOCP_MAJOR_Y
 export RHOCP_MINOR_Y
 export RHOCP_MINOR_Y_BETA
 
-# The 'rhocp_minor_y' variable should be the previous minor version number, if
-# the previous release is available through the 'rhocp' stream, otherwise empty.
+# The 'rhocp_major_y1' and 'rhocp_minor_y1' variables should be the previous major
+# and minor version numbers, if the previous release is available through the
+# 'rhocp' stream, otherwise empty.
+RHOCP_MAJOR_Y1={rhocp_major_y1}
 RHOCP_MINOR_Y1={rhocp_minor_y1}
 # The beta repository, containing dependencies, should point to the
 # OpenShift mirror URL. The mirror for previous release should always
 # be available.
 RHOCP_MINOR_Y1_BETA="{rhocp_minor_y1_beta}"
+export RHOCP_MAJOR_Y1
 export RHOCP_MINOR_Y1
 export RHOCP_MINOR_Y1_BETA
 
-# The 'rhocp_minor_y2' should always be the y-2 minor version number.
+# The 'rhocp_major_y2' and 'rhocp_minor_y2' should always be the y-2 version numbers.
+export RHOCP_MAJOR_Y2={rhocp_major_y2}
 export RHOCP_MINOR_Y2={rhocp_minor_y2}
 
 export CNCF_SONOBUOY_VERSION={CNCF_SONOBUOY_VERSION}
@@ -142,12 +152,12 @@ export CNCF_SYSTEMD_LOGS_VERSION={CNCF_SYSTEMD_LOGS_VERSION}
 export GITOPS_VERSION={GITOPS_VERSION}
 
 # The brew release versions needed for release regression testing
-BREW_Y0_RELEASE_VERSION="$(get_vrel_from_rpm "${{BREW_RPM_SOURCE}}/4.${{MINOR_VERSION}}-zstream/{ARCH}/")"
-BREW_Y1_RELEASE_VERSION="$(get_vrel_from_rpm "${{BREW_RPM_SOURCE}}/4.${{PREVIOUS_MINOR_VERSION}}-zstream/{ARCH}/")"
-BREW_Y2_RELEASE_VERSION="$(get_vrel_from_rpm "${{BREW_RPM_SOURCE}}/4.${{YMINUS2_MINOR_VERSION}}-zstream/{ARCH}/")"
-BREW_RC_RELEASE_VERSION="$(get_vrel_from_rpm "${{BREW_RPM_SOURCE}}/4.${{MINOR_VERSION}}-rc/{ARCH}/")"
-BREW_EC_RELEASE_VERSION="$(get_vrel_from_rpm "${{BREW_RPM_SOURCE}}/4.${{MINOR_VERSION}}-ec/{ARCH}/")"
-BREW_NIGHTLY_RELEASE_VERSION="$(get_vrel_from_rpm "${{BREW_RPM_SOURCE}}/4.${{MINOR_VERSION}}-nightly/{ARCH}/")"
+BREW_Y0_RELEASE_VERSION="$(get_vrel_from_rpm "${{BREW_RPM_SOURCE}}/${{MAJOR_VERSION}}.${{MINOR_VERSION}}-zstream/{ARCH}/")"
+BREW_Y1_RELEASE_VERSION="$(get_vrel_from_rpm "${{BREW_RPM_SOURCE}}/${{PREVIOUS_MAJOR_VERSION}}.${{PREVIOUS_MINOR_VERSION}}-zstream/{ARCH}/")"
+BREW_Y2_RELEASE_VERSION="$(get_vrel_from_rpm "${{BREW_RPM_SOURCE}}/${{YMINUS2_MAJOR_VERSION}}.${{YMINUS2_MINOR_VERSION}}-zstream/{ARCH}/")"
+BREW_RC_RELEASE_VERSION="$(get_vrel_from_rpm "${{BREW_RPM_SOURCE}}/${{MAJOR_VERSION}}.${{MINOR_VERSION}}-rc/{ARCH}/")"
+BREW_EC_RELEASE_VERSION="$(get_vrel_from_rpm "${{BREW_RPM_SOURCE}}/${{MAJOR_VERSION}}.${{MINOR_VERSION}}-ec/{ARCH}/")"
+BREW_NIGHTLY_RELEASE_VERSION="$(get_vrel_from_rpm "${{BREW_RPM_SOURCE}}/${{MAJOR_VERSION}}.${{MINOR_VERSION}}-nightly/{ARCH}/")"
 export BREW_Y0_RELEASE_VERSION
 export BREW_Y1_RELEASE_VERSION
 export BREW_Y2_RELEASE_VERSION
@@ -169,7 +179,7 @@ fi
 export BREW_LREL_RELEASE_VERSION
 
 # Branch and commit for the openshift-tests-private repository
-OPENSHIFT_TESTS_PRIVATE_REPO_BRANCH="release-4.${{MINOR_VERSION}}"
+OPENSHIFT_TESTS_PRIVATE_REPO_BRANCH="release-${{MAJOR_VERSION}}.${{MINOR_VERSION}}"
 OPENSHIFT_TESTS_PRIVATE_REPO_COMMIT="ed0dc50bfaf9b301d175b7035b8c0192ab113db9"
 export OPENSHIFT_TESTS_PRIVATE_REPO_BRANCH
 export OPENSHIFT_TESTS_PRIVATE_REPO_COMMIT

test/bin/build_rpms.sh

@@ -121,12 +121,12 @@ download_brew_rpms() {
         rm -rf "${BREW_RPM_SOURCE}"
         # Run the download procedure
         bash -x "${SCRIPTDIR}/../../scripts/fetch_tools.sh" brew
-        bash -x "${SCRIPTDIR}/manage_brew_rpms.sh" download "4.${MINOR_VERSION}" "${BREW_RPM_SOURCE}" "zstream" || true
-        bash -x "${SCRIPTDIR}/manage_brew_rpms.sh" download "4.${PREVIOUS_MINOR_VERSION}" "${BREW_RPM_SOURCE}" "zstream" || true
-        bash -x "${SCRIPTDIR}/manage_brew_rpms.sh" download "4.${YMINUS2_MINOR_VERSION}" "${BREW_RPM_SOURCE}" "zstream" || true
-        bash -x "${SCRIPTDIR}/manage_brew_rpms.sh" download "4.${MINOR_VERSION}" "${BREW_RPM_SOURCE}" "rc" || true
-        bash -x "${SCRIPTDIR}/manage_brew_rpms.sh" download "4.${MINOR_VERSION}" "${BREW_RPM_SOURCE}" "ec" || true
-        bash -x "${SCRIPTDIR}/manage_brew_rpms.sh" download "4.${MINOR_VERSION}" "${BREW_RPM_SOURCE}" "nightly" || true
+        bash -x "${SCRIPTDIR}/manage_brew_rpms.sh" download "${MAJOR_VERSION}.${MINOR_VERSION}" "${BREW_RPM_SOURCE}" "zstream" || true
+        bash -x "${SCRIPTDIR}/manage_brew_rpms.sh" download "${PREVIOUS_MAJOR_VERSION}.${PREVIOUS_MINOR_VERSION}" "${BREW_RPM_SOURCE}" "zstream" || true
+        bash -x "${SCRIPTDIR}/manage_brew_rpms.sh" download "${YMINUS2_MAJOR_VERSION}.${YMINUS2_MINOR_VERSION}" "${BREW_RPM_SOURCE}" "zstream" || true
+        bash -x "${SCRIPTDIR}/manage_brew_rpms.sh" download "${MAJOR_VERSION}.${MINOR_VERSION}" "${BREW_RPM_SOURCE}" "rc" || true
+        bash -x "${SCRIPTDIR}/manage_brew_rpms.sh" download "${MAJOR_VERSION}.${MINOR_VERSION}" "${BREW_RPM_SOURCE}" "ec" || true
+        bash -x "${SCRIPTDIR}/manage_brew_rpms.sh" download "${MAJOR_VERSION}.${MINOR_VERSION}" "${BREW_RPM_SOURCE}" "nightly" || true
     else
         echo "WARNING: The Brew Hub site is not accessible, skipping the download"
     fi

test/bin/common.sh

@@ -229,7 +229,7 @@ get_build_branch() {
 }
 
 # The branch identifier of the current scenario repository,
-# i.e. "main", "release-4.14", etc.
+# i.e. "main", "release-4.14", "release-5.0", etc.
 # Used for top-level directory names when caching build artifacts,
 # i.e. <bucket_name>/<branch>
 # shellcheck disable=SC2034  # used elsewhere