Skip to content

Commit 70e3659

Browse files
committed
Update common_versions with brew release vars
1 parent 5b3e287 commit 70e3659

File tree

2 files changed

+78
-1
lines changed

2 files changed

+78
-1
lines changed

test/bin/common_versions.sh

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,26 @@ get_vrel_from_rhsm() {
4242
echo ""
4343
}
4444

45+
get_vrel_from_rpm() {
46+
local -r rpm_dir="$1"
47+
48+
local -r rpm_release_info_file=$(find "${rpm_dir}" -name "microshift-release-info-*.rpm" | sort | tail -n1)
49+
if [ -z "${rpm_release_info_file}" ]; then
50+
echo ""
51+
return
52+
fi
53+
54+
local -r rpm_vrel=$(\
55+
rpm -qp --queryformat '%{version}-%{release}' \
56+
-p "${rpm_release_info_file}" 2>/dev/null \
57+
)
58+
if [ -n "${rpm_vrel}" ]; then
59+
echo "${rpm_vrel}"
60+
return
61+
fi
62+
echo ""
63+
}
64+
4565
export MINOR_VERSION=20
4666
export PREVIOUS_MINOR_VERSION=$(( "${MINOR_VERSION}" - 1 ))
4767
export YMINUS2_MINOR_VERSION=$(( "${MINOR_VERSION}" - 2 ))
@@ -76,3 +96,20 @@ export RHOCP_MINOR_Y2=18
7696

7797
export CNCF_SONOBUOY_VERSION=v0.57.3
7898

99+
export GITOPS_VERSION=1.16
100+
101+
BREW_Y0_RELEASE_VERSION="$(get_vrel_from_rpm "${BREW_RPM_SOURCE}/4.${MINOR_VERSION}-zstream/${UNAME_M}/")"
102+
BREW_Y1_RELEASE_VERSION="$(get_vrel_from_rpm "${BREW_RPM_SOURCE}/4.${PREVIOUS_MINOR_VERSION}-zstream/${UNAME_M}/")"
103+
BREW_Y2_RELEASE_VERSION="$(get_vrel_from_rpm "${BREW_RPM_SOURCE}/4.${YMINUS2_MINOR_VERSION}-zstream/${UNAME_M}/")"
104+
BREW_RC_RELEASE_VERSION="$(get_vrel_from_rpm "${BREW_RPM_SOURCE}/4.${MINOR_VERSION}-rc/${UNAME_M}/")"
105+
BREW_EC_RELEASE_VERSION="$(get_vrel_from_rpm "${BREW_RPM_SOURCE}/4.${MINOR_VERSION}-ec/${UNAME_M}/")"
106+
BREW_NIGHTLY_RELEASE_VERSION="$(get_vrel_from_rpm "${BREW_RPM_SOURCE}/4.${MINOR_VERSION}-nightly/${UNAME_M}/")"
107+
export BREW_Y0_RELEASE_VERSION
108+
export BREW_Y1_RELEASE_VERSION
109+
export BREW_Y2_RELEASE_VERSION
110+
export BREW_RC_RELEASE_VERSION
111+
export BREW_EC_RELEASE_VERSION
112+
export BREW_NIGHTLY_RELEASE_VERSION
113+
114+
LATEST_RELEASE_TYPE="ec"
115+
export LATEST_RELEASE_TYPE

test/bin/generate_common_versions.py

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
# See https://github.com/vmware-tanzu/sonobuoy/releases.
1717
CNCF_SONOBUOY_VERSION = "v0.57.3"
1818

19+
# The current version of the microshift-gitops package.
20+
GITOPS_VERSION = "1.16"
21+
1922
logging.basicConfig(
2023
level=logging.INFO,
2124
format='%(levelname)s: %(message)s',
@@ -289,6 +292,26 @@ def get_release_version_string(repo, var_name):
289292
echo ""
290293
}}
291294
295+
get_vrel_from_rpm() {{
296+
local -r rpm_dir="$1"
297+
298+
local -r rpm_release_info_file=$(find "${{rpm_dir}}" -name "microshift-release-info-*.rpm" | sort | tail -n1)
299+
if [ -z "${{rpm_release_info_file}}" ]; then
300+
echo ""
301+
return
302+
fi
303+
304+
local -r rpm_vrel=$(\\
305+
rpm -qp --queryformat '%{{version}}-%{{release}}' \\
306+
-p "${{rpm_release_info_file}}" 2>/dev/null \\
307+
)
308+
if [ -n "${{rpm_vrel}}" ]; then
309+
echo "${{rpm_vrel}}"
310+
return
311+
fi
312+
echo ""
313+
}}
314+
292315
export MINOR_VERSION={minor_version}
293316
export PREVIOUS_MINOR_VERSION=$(( "${{MINOR_VERSION}}" - 1 ))
294317
export YMINUS2_MINOR_VERSION=$(( "${{MINOR_VERSION}}" - 2 ))
@@ -322,7 +345,24 @@ def get_release_version_string(repo, var_name):
322345
export RHOCP_MINOR_Y2={rhocp_minor_y2}
323346
324347
export CNCF_SONOBUOY_VERSION={CNCF_SONOBUOY_VERSION}
325-
"""
348+
349+
export GITOPS_VERSION={GITOPS_VERSION}
350+
351+
BREW_Y0_RELEASE_VERSION="$(get_vrel_from_rpm "${{BREW_RPM_SOURCE}}/4.${{MINOR_VERSION}}-zstream/${{UNAME_M}}/")"
352+
BREW_Y1_RELEASE_VERSION="$(get_vrel_from_rpm "${{BREW_RPM_SOURCE}}/4.${{PREVIOUS_MINOR_VERSION}}-zstream/${{UNAME_M}}/")"
353+
BREW_Y2_RELEASE_VERSION="$(get_vrel_from_rpm "${{BREW_RPM_SOURCE}}/4.${{YMINUS2_MINOR_VERSION}}-zstream/${{UNAME_M}}/")"
354+
BREW_RC_RELEASE_VERSION="$(get_vrel_from_rpm "${{BREW_RPM_SOURCE}}/4.${{MINOR_VERSION}}-rc/${{UNAME_M}}/")"
355+
BREW_EC_RELEASE_VERSION="$(get_vrel_from_rpm "${{BREW_RPM_SOURCE}}/4.${{MINOR_VERSION}}-ec/${{UNAME_M}}/")"
356+
BREW_NIGHTLY_RELEASE_VERSION="$(get_vrel_from_rpm "${{BREW_RPM_SOURCE}}/4.${{MINOR_VERSION}}-nightly/${{UNAME_M}}/")"
357+
export BREW_Y0_RELEASE_VERSION
358+
export BREW_Y1_RELEASE_VERSION
359+
export BREW_Y2_RELEASE_VERSION
360+
export BREW_RC_RELEASE_VERSION
361+
export BREW_EC_RELEASE_VERSION
362+
export BREW_NIGHTLY_RELEASE_VERSION
363+
364+
LATEST_RELEASE_TYPE="ec"
365+
export LATEST_RELEASE_TYPE"""
326366

327367
output_noarch = output.replace(ARCH, '$(uname -m)')
328368

0 commit comments

Comments
 (0)