Skip to content

Commit 2db639e

Browse files
pacevedompacevedom
committed
wip
1 parent 8a16d85 commit 2db639e

19 files changed

+305
-169
lines changed

‎scripts/devenv-builder/configure-vm.sh‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -193,29 +193,32 @@ function configure_rhel_subscription() {
193193
function configure_rhel_repositories() {
194194
sudo subscription-manager config --rhsm.manage_repos=1
195195

196+
# Extract major version from Makefile.version
197+
local -r ocp_major="$(grep '^OCP_VERSION' "${MAKE_VERSION}" | cut -d'=' -f2 | tr -d ' ' | cut -d'.' -f1)"
198+
196199
RHOCP=$("${RHOCP_REPO}")
197-
if [[ "${RHOCP}" =~ ^[0-9]{2} ]]; then
198-
sudo subscription-manager repos --enable "rhocp-4.${RHOCP}-for-rhel-9-$(uname -m)-rpms"
200+
if [[ "${RHOCP}" =~ ^[0-9]{1,2}$ ]]; then
201+
sudo subscription-manager repos --enable "rhocp-${ocp_major}.${RHOCP}-for-rhel-9-$(uname -m)-rpms"
199202
elif [[ "${RHOCP}" =~ ^http ]]; then
200203
url=$(echo "${RHOCP}" | cut -d, -f1)
201204
ver=$(echo "${RHOCP}" | cut -d, -f2)
202-
OCP_REPO_NAME="rhocp-4.${ver}-for-rhel-9-mirrorbeta-$(uname -i)-rpms"
205+
OCP_REPO_NAME="rhocp-${ocp_major}.${ver}-for-rhel-9-mirrorbeta-$(uname -i)-rpms"
203206
sudo tee "/etc/yum.repos.d/${OCP_REPO_NAME}.repo" >/dev/null <<EOF
204207
[${OCP_REPO_NAME}]
205-
name=Beta rhocp-4.${ver} RPMs for RHEL 9
208+
name=Beta rhocp-${ocp_major}.${ver} RPMs for RHEL 9
206209
baseurl=${url}
207210
enabled=1
208211
gpgcheck=0
209212
skip_if_unavailable=0
210213
EOF
211214
PREVIOUS_RHOCP=$("${RHOCP_REPO}" $((ver-1)))
212-
if [[ "${PREVIOUS_RHOCP}" =~ ^[0-9]{2} ]]; then
213-
sudo subscription-manager repos --enable "rhocp-4.${PREVIOUS_RHOCP}-for-rhel-9-$(uname -m)-rpms"
215+
if [[ "${PREVIOUS_RHOCP}" =~ ^[0-9]{1,2}$ ]]; then
216+
sudo subscription-manager repos --enable "rhocp-${ocp_major}.${PREVIOUS_RHOCP}-for-rhel-9-$(uname -m)-rpms"
214217
else
215218
# If RHOCP Y-1 is not available, try RHOCP Y-2.
216219
Y2_RHOCP=$("${RHOCP_REPO}" $((ver-2)))
217-
if [[ "${Y2_RHOCP}" =~ ^[0-9]{2} ]]; then
218-
sudo subscription-manager repos --enable "rhocp-4.${Y2_RHOCP}-for-rhel-9-$(uname -m)-rpms"
220+
if [[ "${Y2_RHOCP}" =~ ^[0-9]{1,2}$ ]]; then
221+
sudo subscription-manager repos --enable "rhocp-${ocp_major}.${Y2_RHOCP}-for-rhel-9-$(uname -m)-rpms"
219222
fi
220223
fi
221224
fi
@@ -273,8 +276,10 @@ function install_openshift_clients() {
273276
"${DNF_RETRY}" "install" "openshift-clients"
274277
else
275278
# Assume the current development version on non-RHEL OS
276-
OCPVERSION="4.$(cut -d'.' -f2 "${MAKE_VERSION}")"
277-
OCC_SRC="https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/dependencies/rpms/${OCPVERSION}-el9-beta"
279+
OCP_MAJOR="$(grep '^OCP_VERSION' "${MAKE_VERSION}" | cut -d'=' -f2 | tr -d ' ' | cut -d'.' -f1)"
280+
OCP_MINOR="$(grep '^OCP_VERSION' "${MAKE_VERSION}" | cut -d'=' -f2 | tr -d ' ' | cut -d'.' -f2)"
281+
OCPVERSION="${OCP_MAJOR}.${OCP_MINOR}"
282+
OCC_SRC="https://mirror.openshift.com/pub/openshift-v${OCP_MAJOR}/$(uname -m)/dependencies/rpms/${OCPVERSION}-el9-beta"
278283
OCC_RPM="$(curl -s "${OCC_SRC}/" | grep -o "openshift-clients-4[^\"']*.rpm" | sort | uniq)"
279284
OCC_LOC="$(mktemp /tmp/openshift-client-XXXXX.rpm)"
280285
OCC_REM="${OCC_SRC}/${OCC_RPM}"

‎scripts/get-latest-rhocp-repo.sh‎

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
# - just a minor version in case of subscription RHOCP repository, e.g.: 15
1515
# - or an URL to beta mirror followed by comma and minor version, e.g.:
1616
# https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rpms/4.16-el9-beta/,16
17+
# https://mirror.openshift.com/pub/openshift-v5/x86_64/dependencies/rpms/5.0-el9-beta/,0
1718

1819
set -euo pipefail
1920

@@ -25,39 +26,44 @@ if ! sudo subscription-manager status >&/dev/null; then
2526
exit 1
2627
fi
2728

29+
# Get version of currently checked out branch.
30+
# It's based on values stored in Makefile.version.$ARCH.var.
31+
make_version="${REPOROOT}/Makefile.version.$(uname -m).var"
32+
if [ ! -f "${make_version}" ] ; then
33+
# Attempt to locate the Makefile version file next to the current script.
34+
# This is necessary when bootstrapping the development environment for the first time.
35+
make_version=$(find "${SCRIPTDIR}" -maxdepth 1 -name "Makefile.version.$(uname -m).*.var" | tail -1)
36+
if [ ! -f "${make_version}" ] ; then
37+
>&2 echo "Cannot find the Makefile.version.$(uname -m).var file"
38+
exit 1
39+
fi
40+
fi
41+
current_major=$(grep '^OCP_VERSION' "${make_version}" | cut -d'=' -f2 | tr -d ' ' | cut -d'.' -f1)
42+
2843
if [[ "$#" -eq 1 ]]; then
2944
current_minor="${1}"
3045
stop="${current_minor}"
3146
else
32-
# Get minor version of currently checked out branch.
33-
# It's based on values stored in Makefile.version.$ARCH.var.
34-
make_version="${REPOROOT}/Makefile.version.$(uname -m).var"
35-
if [ ! -f "${make_version}" ] ; then
36-
# Attempt to locate the Makefile version file next to the current script.
37-
# This is necessary when bootstrapping the development environment for the first time.
38-
make_version=$(find "${SCRIPTDIR}" -maxdepth 1 -name "Makefile.version.$(uname -m).*.var" | tail -1)
39-
if [ ! -f "${make_version}" ] ; then
40-
>&2 echo "Cannot find the Makefile.version.$(uname -m).var file"
41-
exit 1
42-
fi
43-
fi
44-
current_minor=$(cut -d'.' -f2 "${make_version}")
47+
current_minor=$(grep '^OCP_VERSION' "${make_version}" | cut -d'=' -f2 | tr -d ' ' | cut -d'.' -f2)
4548
stop=$(( current_minor - 3 ))
49+
if (( stop < 0 )); then
50+
stop=0
51+
fi
4652
fi
4753

48-
# Go through minor versions, starting from current_mirror counting down
54+
# Go through minor versions, starting from current_minor counting down
4955
# to get latest available rhocp repository.
50-
# For example, at the time of writing this comment, current_minor is 16,
51-
# and following code will try to access rhocp-4.15 (which is not released yet)
52-
# and then rhocp-4.14 (which will be returned from the script because it's usable).
56+
# For example, if current version is 4.16, the code will try to access
57+
# rhocp-4.15 (which may not be released yet) and then rhocp-4.14 (which
58+
# will be returned if it's usable). Works similarly for version 5.x.
5359
for ver in $(seq "${current_minor}" -1 "${stop}"); do
54-
repository="rhocp-4.${ver}-for-rhel-9-$(uname -m)-rpms"
60+
repository="rhocp-${current_major}.${ver}-for-rhel-9-$(uname -m)-rpms"
5561
if sudo dnf repository-packages --showduplicates "${repository}" info cri-o 1>&2; then
5662
echo "${ver}"
5763
exit 0
5864
fi
5965

60-
rhocp_beta_url="https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/dependencies/rpms/4.${ver}-el9-beta/"
66+
rhocp_beta_url="https://mirror.openshift.com/pub/openshift-v${current_major}/$(uname -m)/dependencies/rpms/${current_major}.${ver}-el9-beta/"
6167
if sudo dnf repository-packages --showduplicates --disablerepo '*' --repofrompath "this,${rhocp_beta_url}" this info cri-o 1>&2; then
6268
echo "${rhocp_beta_url},${ver}"
6369
exit 0

‎scripts/release-notes/gen_gh_releases_from_mirror.py‎

Lines changed: 30 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,11 @@
6060

6161
logging.basicConfig(level=logging.DEBUG, format='%(asctime)s %(levelname)-8s [%(filename)s:%(lineno)d] %(message)s')
6262

63-
URL_BASE = "https://mirror.openshift.com/pub/openshift-v4/aarch64/microshift"
64-
URL_BASE_X86 = "https://mirror.openshift.com/pub/openshift-v4/x86_64/microshift"
63+
64+
def get_mirror_url_base(major_version, arch):
65+
"""Get the mirror URL base for the given major version and architecture."""
66+
return f"https://mirror.openshift.com/pub/openshift-v{major_version}/{arch}/microshift"
67+
6568

6669
# An EC RPM filename looks like
6770
# microshift-4.13.0~ec.4-202303070857.p0.gcf0bce2.assembly.ec.4.el9.aarch64.rpm
@@ -167,13 +170,22 @@ def main():
167170
if args.versions_to_scan:
168171
versions_to_scan = args.versions_to_scan
169172

173+
# Group versions by major to use correct mirror URL bases
174+
versions_by_major = {}
175+
for version in versions_to_scan:
176+
scan_major = version.split('.', 1)[0]
177+
versions_by_major.setdefault(scan_major, []).append(version)
178+
170179
new_releases = []
171-
if args.ec:
172-
new_releases.extend(find_new_releases(versions_to_scan, URL_BASE, 'ocp-dev-preview'))
173-
new_releases.extend(find_new_releases(versions_to_scan, URL_BASE_X86, 'ocp-dev-preview'))
174-
if args.rc:
175-
new_releases.extend(find_new_releases(versions_to_scan, URL_BASE, 'ocp'))
176-
new_releases.extend(find_new_releases(versions_to_scan, URL_BASE_X86, 'ocp'))
180+
for scan_major, scan_versions in versions_by_major.items():
181+
url_base_aarch64 = get_mirror_url_base(scan_major, 'aarch64')
182+
url_base_x86 = get_mirror_url_base(scan_major, 'x86_64')
183+
if args.ec:
184+
new_releases.extend(find_new_releases(scan_versions, url_base_aarch64, 'ocp-dev-preview'))
185+
new_releases.extend(find_new_releases(scan_versions, url_base_x86, 'ocp-dev-preview'))
186+
if args.rc:
187+
new_releases.extend(find_new_releases(scan_versions, url_base_aarch64, 'ocp'))
188+
new_releases.extend(find_new_releases(scan_versions, url_base_x86, 'ocp'))
177189

178190
if not new_releases:
179191
logging.info("No new releases found.")
@@ -194,7 +206,7 @@ def main():
194206
class VersionListParser(html.parser.HTMLParser):
195207
"""HTMLParser to extract version numbers from the mirror file list pages.
196208
197-
A page like https://mirror.openshift.com/pub/openshift-v4/aarch64/microshift/ocp-dev-preview/
209+
A page like https://mirror.openshift.com/pub/openshift-v{major}/aarch64/microshift/ocp-dev-preview/
198210
199211
contains HTML like
200212
@@ -355,20 +367,25 @@ def publish_candidate_release(new_release, take_action):
355367
candidate_number = new_release.candidate_number
356368
release_type = new_release.release_type
357369

370+
# Extract major version from product version (e.g., "4" from "4.16.0")
371+
major_version = product_version.split('.')[0]
372+
url_base_x86 = get_mirror_url_base(major_version, 'x86_64')
373+
url_base_aarch64 = get_mirror_url_base(major_version, 'aarch64')
374+
358375
# Set up the release notes preamble with download links
359376
preamble = textwrap.dedent(f"""
360377
This is a candidate release for {product_version}.
361378
362379
See the mirror for build artifacts:
363-
- {URL_BASE_X86}/{release_type}/{product_version}-{candidate_type}.{candidate_number}/
364-
- {URL_BASE}/{release_type}/{product_version}-{candidate_type}.{candidate_number}/
380+
- {url_base_x86}/{release_type}/{product_version}-{candidate_type}.{candidate_number}/
381+
- {url_base_aarch64}/{release_type}/{product_version}-{candidate_type}.{candidate_number}/
365382
366383
Or add this RPM repository to your x86 systems:
367384
368385
```
369386
[microshift-{product_version}-{candidate_type}-{candidate_number}]
370387
name=MicroShift {product_version} EarlyAccess {candidate_type}.{candidate_number} RPMs
371-
baseurl={URL_BASE_X86}/{release_type}/{product_version}-{candidate_type}.{candidate_number}/el9/os/
388+
baseurl={url_base_x86}/{release_type}/{product_version}-{candidate_type}.{candidate_number}/el9/os/
372389
enabled=1
373390
gpgcheck=0
374391
skip_if_unavailable=0
@@ -379,7 +396,7 @@ def publish_candidate_release(new_release, take_action):
379396
```
380397
[microshift-{product_version}-{candidate_type}-{candidate_number}]
381398
name=MicroShift {product_version} EarlyAccess {candidate_type}.{candidate_number} RPMs
382-
baseurl={URL_BASE}/{release_type}/{product_version}-{candidate_type}.{candidate_number}/el9/os/
399+
baseurl={url_base_aarch64}/{release_type}/{product_version}-{candidate_type}.{candidate_number}/el9/os/
383400
enabled=1
384401
gpgcheck=0
385402
skip_if_unavailable=0

‎scripts/release-notes/gen_gh_releases_from_rhocp.py‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def get_rpm_releases():
2626
"""Gets the releases from the released MicroShift RPMs in the RHOCP repositories.
2727
"""
2828
arch = platform.machine()
29-
_, current_minor = common.get_version_from_makefile()
29+
current_major, current_minor = common.get_version_from_makefile()
3030

3131
with dnf.Base() as base:
3232
base.read_all_repos()
@@ -36,8 +36,10 @@ def get_rpm_releases():
3636

3737
# Enable RHOCP repos starting from 4.14 to the current-2 (inclusive; range() stops before the second argument).
3838
# E.g., for 4.21 it's 4.14-4.19 because when 4.21 development started, the 4.20 wasn't released yet.
39-
for minor in range(14, int(current_minor)-1):
40-
repo_id = f"rhocp-4.{minor}-for-rhel-9-{arch}-rpms"
39+
# For major version 5, start from 5.0; for major version 4, start from 4.14.
40+
start_minor = 0 if int(current_major) >= 5 else 14
41+
for minor in range(start_minor, int(current_minor)-1):
42+
repo_id = f"rhocp-{current_major}.{minor}-for-rhel-9-{arch}-rpms"
4143
r = base.repos.get_matching(repo_id)
4244
r.enable()
4345
logging.info(f'Enabled repo: {r.id} - {r.name}')
@@ -48,7 +50,7 @@ def get_rpm_releases():
4850
# Try to add current-1 (continuing example from above, it'd be 4.20).
4951
# This is separate because DNF does not query remote repos in order, so enabling not active repo can derail whole cache update.
5052
try:
51-
r = base.repos.get(f"rhocp-4.{int(current_minor)-1}-for-rhel-9-{arch}-rpms")
53+
r = base.repos.get(f"rhocp-{current_major}.{int(current_minor)-1}-for-rhel-9-{arch}-rpms")
5254
r.enable()
5355
logging.info(f'Enabled repo: {r.id} - {r.name}')
5456
base.fill_sack()

‎test/assets/common_versions.sh.template‎

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,14 @@ get_vrel_from_rpm() {{
6868
echo ""
6969
}}
7070

71-
# The current release minor version (e.g. '17' for '4.17') affects
71+
# The current release version (e.g. '4.17') affects
7272
# the definition of previous and fake next versions.
73+
export MAJOR_VERSION={major_version}
7374
export MINOR_VERSION={minor_version}
74-
export PREVIOUS_MINOR_VERSION=$(( "${{MINOR_VERSION}}" - 1 ))
75-
export YMINUS2_MINOR_VERSION=$(( "${{MINOR_VERSION}}" - 2 ))
75+
export PREVIOUS_MAJOR_VERSION={previous_major_version}
76+
export PREVIOUS_MINOR_VERSION={previous_minor_version}
77+
export YMINUS2_MAJOR_VERSION={yminus2_major_version}
78+
export YMINUS2_MINOR_VERSION={yminus2_minor_version}
7679
export FAKE_NEXT_MINOR_VERSION=$(( "${{MINOR_VERSION}}" + 1 ))
7780

7881
# For a main branch, the current release repository usually comes from
@@ -110,27 +113,34 @@ YMINUS2_RELEASE_VERSION="{yminus2_release_version}"
110113
export YMINUS2_RELEASE_REPO
111114
export YMINUS2_RELEASE_VERSION
112115

113-
# The 'rhocp_minor_y' variable should be the minor version number, if the
114-
# current release is available through the 'rhocp' stream, otherwise empty.
116+
# The 'rhocp_major_y' and 'rhocp_minor_y' variables should be the major and minor
117+
# version numbers, if the current release is available through the 'rhocp' stream,
118+
# otherwise empty.
119+
RHOCP_MAJOR_Y={rhocp_major_y}
115120
RHOCP_MINOR_Y={rhocp_minor_y}
116121
# The beta repository, containing dependencies, should point to the
117122
# OpenShift mirror URL. If the mirror for current minor is not
118123
# available yet, it should point to an older release.
119124
RHOCP_MINOR_Y_BETA="{rhocp_minor_y_beta}"
125+
export RHOCP_MAJOR_Y
120126
export RHOCP_MINOR_Y
121127
export RHOCP_MINOR_Y_BETA
122128

123-
# The 'rhocp_minor_y' variable should be the previous minor version number, if
124-
# the previous release is available through the 'rhocp' stream, otherwise empty.
129+
# The 'rhocp_major_y1' and 'rhocp_minor_y1' variables should be the previous major
130+
# and minor version numbers, if the previous release is available through the
131+
# 'rhocp' stream, otherwise empty.
132+
RHOCP_MAJOR_Y1={rhocp_major_y1}
125133
RHOCP_MINOR_Y1={rhocp_minor_y1}
126134
# The beta repository, containing dependencies, should point to the
127135
# OpenShift mirror URL. The mirror for previous release should always
128136
# be available.
129137
RHOCP_MINOR_Y1_BETA="{rhocp_minor_y1_beta}"
138+
export RHOCP_MAJOR_Y1
130139
export RHOCP_MINOR_Y1
131140
export RHOCP_MINOR_Y1_BETA
132141

133-
# The 'rhocp_minor_y2' should always be the y-2 minor version number.
142+
# The 'rhocp_major_y2' and 'rhocp_minor_y2' should always be the y-2 version numbers.
143+
export RHOCP_MAJOR_Y2={rhocp_major_y2}
134144
export RHOCP_MINOR_Y2={rhocp_minor_y2}
135145

136146
export CNCF_SONOBUOY_VERSION={CNCF_SONOBUOY_VERSION}
@@ -142,12 +152,12 @@ export CNCF_SYSTEMD_LOGS_VERSION={CNCF_SYSTEMD_LOGS_VERSION}
142152
export GITOPS_VERSION={GITOPS_VERSION}
143153

144154
# The brew release versions needed for release regression testing
145-
BREW_Y0_RELEASE_VERSION="$(get_vrel_from_rpm "${{BREW_RPM_SOURCE}}/4.${{MINOR_VERSION}}-zstream/{ARCH}/")"
146-
BREW_Y1_RELEASE_VERSION="$(get_vrel_from_rpm "${{BREW_RPM_SOURCE}}/4.${{PREVIOUS_MINOR_VERSION}}-zstream/{ARCH}/")"
147-
BREW_Y2_RELEASE_VERSION="$(get_vrel_from_rpm "${{BREW_RPM_SOURCE}}/4.${{YMINUS2_MINOR_VERSION}}-zstream/{ARCH}/")"
148-
BREW_RC_RELEASE_VERSION="$(get_vrel_from_rpm "${{BREW_RPM_SOURCE}}/4.${{MINOR_VERSION}}-rc/{ARCH}/")"
149-
BREW_EC_RELEASE_VERSION="$(get_vrel_from_rpm "${{BREW_RPM_SOURCE}}/4.${{MINOR_VERSION}}-ec/{ARCH}/")"
150-
BREW_NIGHTLY_RELEASE_VERSION="$(get_vrel_from_rpm "${{BREW_RPM_SOURCE}}/4.${{MINOR_VERSION}}-nightly/{ARCH}/")"
155+
BREW_Y0_RELEASE_VERSION="$(get_vrel_from_rpm "${{BREW_RPM_SOURCE}}/${{MAJOR_VERSION}}.${{MINOR_VERSION}}-zstream/{ARCH}/")"
156+
BREW_Y1_RELEASE_VERSION="$(get_vrel_from_rpm "${{BREW_RPM_SOURCE}}/${{PREVIOUS_MAJOR_VERSION}}.${{PREVIOUS_MINOR_VERSION}}-zstream/{ARCH}/")"
157+
BREW_Y2_RELEASE_VERSION="$(get_vrel_from_rpm "${{BREW_RPM_SOURCE}}/${{YMINUS2_MAJOR_VERSION}}.${{YMINUS2_MINOR_VERSION}}-zstream/{ARCH}/")"
158+
BREW_RC_RELEASE_VERSION="$(get_vrel_from_rpm "${{BREW_RPM_SOURCE}}/${{MAJOR_VERSION}}.${{MINOR_VERSION}}-rc/{ARCH}/")"
159+
BREW_EC_RELEASE_VERSION="$(get_vrel_from_rpm "${{BREW_RPM_SOURCE}}/${{MAJOR_VERSION}}.${{MINOR_VERSION}}-ec/{ARCH}/")"
160+
BREW_NIGHTLY_RELEASE_VERSION="$(get_vrel_from_rpm "${{BREW_RPM_SOURCE}}/${{MAJOR_VERSION}}.${{MINOR_VERSION}}-nightly/{ARCH}/")"
151161
export BREW_Y0_RELEASE_VERSION
152162
export BREW_Y1_RELEASE_VERSION
153163
export BREW_Y2_RELEASE_VERSION
@@ -169,7 +179,7 @@ fi
169179
export BREW_LREL_RELEASE_VERSION
170180

171181
# Branch and commit for the openshift-tests-private repository
172-
OPENSHIFT_TESTS_PRIVATE_REPO_BRANCH="release-4.${{MINOR_VERSION}}"
182+
OPENSHIFT_TESTS_PRIVATE_REPO_BRANCH="release-${{MAJOR_VERSION}}.${{MINOR_VERSION}}"
173183
OPENSHIFT_TESTS_PRIVATE_REPO_COMMIT="ed0dc50bfaf9b301d175b7035b8c0192ab113db9"
174184
export OPENSHIFT_TESTS_PRIVATE_REPO_BRANCH
175185
export OPENSHIFT_TESTS_PRIVATE_REPO_COMMIT

‎test/bin/build_rpms.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -121,12 +121,12 @@ download_brew_rpms() {
121121
rm -rf "${BREW_RPM_SOURCE}"
122122
# Run the download procedure
123123
bash -x "${SCRIPTDIR}/../../scripts/fetch_tools.sh" brew
124-
bash -x "${SCRIPTDIR}/manage_brew_rpms.sh" download "4.${MINOR_VERSION}" "${BREW_RPM_SOURCE}" "zstream" || true
125-
bash -x "${SCRIPTDIR}/manage_brew_rpms.sh" download "4.${PREVIOUS_MINOR_VERSION}" "${BREW_RPM_SOURCE}" "zstream" || true
126-
bash -x "${SCRIPTDIR}/manage_brew_rpms.sh" download "4.${YMINUS2_MINOR_VERSION}" "${BREW_RPM_SOURCE}" "zstream" || true
127-
bash -x "${SCRIPTDIR}/manage_brew_rpms.sh" download "4.${MINOR_VERSION}" "${BREW_RPM_SOURCE}" "rc" || true
128-
bash -x "${SCRIPTDIR}/manage_brew_rpms.sh" download "4.${MINOR_VERSION}" "${BREW_RPM_SOURCE}" "ec" || true
129-
bash -x "${SCRIPTDIR}/manage_brew_rpms.sh" download "4.${MINOR_VERSION}" "${BREW_RPM_SOURCE}" "nightly" || true
124+
bash -x "${SCRIPTDIR}/manage_brew_rpms.sh" download "${MAJOR_VERSION}.${MINOR_VERSION}" "${BREW_RPM_SOURCE}" "zstream" || true
125+
bash -x "${SCRIPTDIR}/manage_brew_rpms.sh" download "${PREVIOUS_MAJOR_VERSION}.${PREVIOUS_MINOR_VERSION}" "${BREW_RPM_SOURCE}" "zstream" || true
126+
bash -x "${SCRIPTDIR}/manage_brew_rpms.sh" download "${YMINUS2_MAJOR_VERSION}.${YMINUS2_MINOR_VERSION}" "${BREW_RPM_SOURCE}" "zstream" || true
127+
bash -x "${SCRIPTDIR}/manage_brew_rpms.sh" download "${MAJOR_VERSION}.${MINOR_VERSION}" "${BREW_RPM_SOURCE}" "rc" || true
128+
bash -x "${SCRIPTDIR}/manage_brew_rpms.sh" download "${MAJOR_VERSION}.${MINOR_VERSION}" "${BREW_RPM_SOURCE}" "ec" || true
129+
bash -x "${SCRIPTDIR}/manage_brew_rpms.sh" download "${MAJOR_VERSION}.${MINOR_VERSION}" "${BREW_RPM_SOURCE}" "nightly" || true
130130
else
131131
echo "WARNING: The Brew Hub site is not accessible, skipping the download"
132132
fi

‎test/bin/common.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ get_build_branch() {
229229
}
230230

231231
# The branch identifier of the current scenario repository,
232-
# i.e. "main", "release-4.14", etc.
232+
# i.e. "main", "release-4.14", "release-5.0", etc.
233233
# Used for top-level directory names when caching build artifacts,
234234
# i.e. <bucket_name>/<branch>
235235
# shellcheck disable=SC2034 # used elsewhere

0 commit comments

Comments
 (0)