Skip to content

USHIFT-6073: Add "from previous Z" upgrade path on releases scenarios #5862

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
agullon wants to merge 2 commits into
base: main
Choose a base branch
from
Open

USHIFT-6073: Add "from previous Z" upgrade path on releases scenarios #5862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfa1ca4
USHIFT-6073: Add Z-1 upgrade path for release testing scenarios
agullon Jan 30, 2026
f8f4992
temp bucket for testing
agullon Jan 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 29 additions & 11 deletions test/assets/common_versions.sh.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,22 +142,40 @@ 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}/")"
export BREW_Y0_RELEASE_VERSION
export BREW_Y1_RELEASE_VERSION
export BREW_Y2_RELEASE_VERSION
#
# Version naming convention (for X.Y.Z format where X=major, Y=minor, Z=patch):
# - LATEST_ZSTREAM: Latest z-stream of current minor (e.g., 4.22.7) - for current release testing
# - PREV_ZSTREAM: Previous z-stream of current minor (e.g., 4.22.4) - for previous Z upgrade testing
# - YMINUS1: Latest z-stream of previous minor (e.g., 4.21.26) - for Y-1 upgrade testing
# - YMINUS2: Latest z-stream of Y-2 minor (e.g., 4.20.44) - for Y-2 upgrade testing
#
LATEST_ZSTREAM_VERSION="$(find "${{BREW_RPM_SOURCE}}" -maxdepth 1 -type d -regex ".*/[45]\.${{MINOR_VERSION}}\.[0-9]+$" -printf '%f\n' | sort -V | tail -n1 || echo "")"
PREV_ZSTREAM_VERSION="$(find "${{BREW_RPM_SOURCE}}" -maxdepth 1 -type d -regex ".*/[45]\.${{MINOR_VERSION}}\.[0-9]+$" -printf '%f\n' | sort -V | head -n1 || echo "")"
YMINUS1_VERSION="$(find "${{BREW_RPM_SOURCE}}" -maxdepth 1 -type d -regex ".*/[45]\.${{PREVIOUS_MINOR_VERSION}}\.[0-9]+$" -printf '%f\n' | sort -V | tail -n1 || echo "")"
YMINUS2_VERSION="$(find "${{BREW_RPM_SOURCE}}" -maxdepth 1 -type d -regex ".*/[45]\.${{YMINUS2_MINOR_VERSION}}\.[0-9]+$" -printf '%f\n' | sort -V | tail -n1 || echo "")"
RC_VERSION="$(find "${{BREW_RPM_SOURCE}}" -maxdepth 1 -type d -regex ".*/[45]\.${{MINOR_VERSION}}\.[0-9]*-rc$" -printf '%f\n' | sort -V | tail -n1 || echo "")"
EC_VERSION="$(find "${{BREW_RPM_SOURCE}}" -maxdepth 1 -type d -regex ".*/[45]\.${{MINOR_VERSION}}\.[0-9]*-ec$" -printf '%f\n' | sort -V | tail -n1 || echo "")"
NIGHTLY_VERSION="$(find "${{BREW_RPM_SOURCE}}" -maxdepth 1 -type d -regex ".*/[45]\.${{MINOR_VERSION}}\.[0-9]*-nightly$" -printf '%f\n' | sort -V | tail -n1 || echo "")"

BREW_LATEST_ZSTREAM_VERSION="$(get_vrel_from_rpm "${{BREW_RPM_SOURCE}}/${{LATEST_ZSTREAM_VERSION}}/{ARCH}/")"
BREW_PREV_ZSTREAM_VERSION="$(get_vrel_from_rpm "${{BREW_RPM_SOURCE}}/${{PREV_ZSTREAM_VERSION}}/{ARCH}/")"
BREW_YMINUS1_VERSION="$(get_vrel_from_rpm "${{BREW_RPM_SOURCE}}/${{YMINUS1_VERSION}}/{ARCH}/")"
BREW_YMINUS2_VERSION="$(get_vrel_from_rpm "${{BREW_RPM_SOURCE}}/${{YMINUS2_VERSION}}/{ARCH}/")"
BREW_RC_RELEASE_VERSION="$(get_vrel_from_rpm "${{BREW_RPM_SOURCE}}/${{RC_VERSION}}/{ARCH}/")"
BREW_EC_RELEASE_VERSION="$(get_vrel_from_rpm "${{BREW_RPM_SOURCE}}/${{EC_VERSION}}/{ARCH}/")"
BREW_NIGHTLY_RELEASE_VERSION="$(get_vrel_from_rpm "${{BREW_RPM_SOURCE}}/${{NIGHTLY_VERSION}}/{ARCH}/")"

export BREW_LATEST_ZSTREAM_VERSION
export BREW_PREV_ZSTREAM_VERSION
export BREW_YMINUS1_VERSION
export BREW_YMINUS2_VERSION
export BREW_RC_RELEASE_VERSION
export BREW_EC_RELEASE_VERSION
export BREW_NIGHTLY_RELEASE_VERSION

# Set the release type based on priority: zstream > RC > EC > nightly
if [ -n "${{BREW_Y0_RELEASE_VERSION}}" ]; then
BREW_LREL_RELEASE_VERSION="${{BREW_Y0_RELEASE_VERSION}}"
if [ -n "${{BREW_LATEST_ZSTREAM_VERSION}}" ]; then
BREW_LREL_RELEASE_VERSION="${{BREW_LATEST_ZSTREAM_VERSION}}"
elif [ -n "${{BREW_RC_RELEASE_VERSION}}" ]; then
BREW_LREL_RELEASE_VERSION="${{BREW_RC_RELEASE_VERSION}}"
elif [ -n "${{BREW_EC_RELEASE_VERSION}}" ]; then
Expand Down
6 changes: 3 additions & 3 deletions test/bin/build_images.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,9 +721,9 @@ if ${EXTRACT_CONTAINER_IMAGES}; then
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.
[ -n "${BREW_Y0_RELEASE_VERSION}" ] && extract_container_images "${BREW_Y0_RELEASE_VERSION}" "${BREW_REPO}" "${CONTAINER_LIST}"
[ -n "${BREW_Y1_RELEASE_VERSION}" ] && extract_container_images "${BREW_Y1_RELEASE_VERSION}" "${BREW_REPO}" "${CONTAINER_LIST}"
[ -n "${BREW_Y2_RELEASE_VERSION}" ] && extract_container_images "${BREW_Y2_RELEASE_VERSION}" "${BREW_REPO}" "${CONTAINER_LIST}"
[ -n "${BREW_LATEST_ZSTREAM_VERSION}" ] && extract_container_images "${BREW_LATEST_ZSTREAM_VERSION}" "${BREW_REPO}" "${CONTAINER_LIST}"
[ -n "${BREW_YMINUS1_VERSION}" ] && extract_container_images "${BREW_YMINUS1_VERSION}" "${BREW_REPO}" "${CONTAINER_LIST}"
[ -n "${BREW_YMINUS2_VERSION}" ] && extract_container_images "${BREW_YMINUS2_VERSION}" "${BREW_REPO}" "${CONTAINER_LIST}"
[ -n "${BREW_RC_RELEASE_VERSION}" ] && extract_container_images "${BREW_RC_RELEASE_VERSION}" "${BREW_REPO}" "${CONTAINER_LIST}"
[ -n "${BREW_EC_RELEASE_VERSION}" ] && extract_container_images "${BREW_EC_RELEASE_VERSION}" "${BREW_REPO}" "${CONTAINER_LIST}"
[ -n "${BREW_NIGHTLY_RELEASE_VERSION}" ] && extract_container_images "${BREW_NIGHTLY_RELEASE_VERSION}" "${BREW_REPO}" "${CONTAINER_LIST}"
Expand Down
12 changes: 6 additions & 6 deletions test/bin/build_rpms.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "4.${MINOR_VERSION}" "${BREW_RPM_SOURCE}" "rc" || echo "WARNING: Failed to download RC RPMs for 4.${MINOR_VERSION}"
bash -x "${SCRIPTDIR}/manage_brew_rpms.sh" download "4.${MINOR_VERSION}" "${BREW_RPM_SOURCE}" "ec" || echo "WARNING: Failed to download EC RPMs for 4.${MINOR_VERSION}"
bash -x "${SCRIPTDIR}/manage_brew_rpms.sh" download "4.${MINOR_VERSION}" "${BREW_RPM_SOURCE}" "zstream" || echo "WARNING: Failed to download zstream RPMs for 4.${MINOR_VERSION}"
bash -x "${SCRIPTDIR}/manage_brew_rpms.sh" download "4.${MINOR_VERSION}" "${BREW_RPM_SOURCE}" "nightly" || echo "WARNING: Failed to download nightly RPMs for 4.${MINOR_VERSION}"
bash -x "${SCRIPTDIR}/manage_brew_rpms.sh" download "4.${PREVIOUS_MINOR_VERSION}" "${BREW_RPM_SOURCE}" "zstream" || echo "WARNING: Failed to download zstream RPMs for 4.${PREVIOUS_MINOR_VERSION}"
bash -x "${SCRIPTDIR}/manage_brew_rpms.sh" download "4.${YMINUS2_MINOR_VERSION}" "${BREW_RPM_SOURCE}" "zstream" || ( echo "WARNING: Failed to download zstream RPMs for 4.${YMINUS2_MINOR_VERSION}" && return 1 )
else
echo "WARNING: The Brew Hub site is not accessible, skipping the download"
fi
Expand Down
18 changes: 16 additions & 2 deletions test/bin/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,8 @@ MICROSHIFT_MANDATORY_RPMS_LIST=(
microshift
microshift-release-info
)

## Optional RPMs
MICROSHIFT_Y2_OPTIONAL_RPMS_LIST=(
microshift-olm
microshift-olm-release-info
Expand All @@ -387,24 +389,36 @@ MICROSHIFT_Y1_OPTIONAL_RPMS_LIST=(
microshift-sriov
microshift-sriov-release-info
)
MICROSHIFT_OPTIONAL_RPMS_LIST=(
MICROSHIFT_PREV_ZSTREAM_OPTIONAL_RPMS_LIST=(
"${MICROSHIFT_Y1_OPTIONAL_RPMS_LIST[@]}"
)
MICROSHIFT_OPTIONAL_RPMS_LIST=(
"${MICROSHIFT_PREV_ZSTREAM_OPTIONAL_RPMS_LIST[@]}"
)

## x86_64 RPMs
MICROSHIFT_Y2_X86_64_RPMS_LIST=(
microshift-ai-model-serving
microshift-ai-model-serving-release-info
)
MICROSHIFT_Y1_X86_64_RPMS_LIST=(
"${MICROSHIFT_Y2_X86_64_RPMS_LIST[@]}"
)
MICROSHIFT_PREV_ZSTREAM_X86_64_RPMS_LIST=(
"${MICROSHIFT_Y2_X86_64_RPMS_LIST[@]}"
)
MICROSHIFT_X86_64_RPMS_LIST=(
"${MICROSHIFT_Y1_X86_64_RPMS_LIST[@]}"
"${MICROSHIFT_PREV_ZSTREAM_X86_64_RPMS_LIST[@]}"
)

export MICROSHIFT_MANDATORY_RPMS="${MICROSHIFT_MANDATORY_RPMS_LIST[*]}"

export MICROSHIFT_Y2_OPTIONAL_RPMS="${MICROSHIFT_Y2_OPTIONAL_RPMS_LIST[*]}"
export MICROSHIFT_Y1_OPTIONAL_RPMS="${MICROSHIFT_Y1_OPTIONAL_RPMS_LIST[*]}"
export MICROSHIFT_PREV_ZSTREAM_OPTIONAL_RPMS="${MICROSHIFT_PREV_ZSTREAM_OPTIONAL_RPMS_LIST[*]}"
export MICROSHIFT_OPTIONAL_RPMS="${MICROSHIFT_OPTIONAL_RPMS_LIST[*]}"

export MICROSHIFT_Y2_X86_64_RPMS="${MICROSHIFT_Y2_X86_64_RPMS_LIST[*]}"
export MICROSHIFT_Y1_X86_64_RPMS="${MICROSHIFT_Y1_X86_64_RPMS_LIST[*]}"
export MICROSHIFT_PREV_ZSTREAM_X86_64_RPMS="${MICROSHIFT_PREV_ZSTREAM_X86_64_RPMS_LIST[*]}"
export MICROSHIFT_X86_64_RPMS="${MICROSHIFT_X86_64_RPMS_LIST[*]}"
40 changes: 29 additions & 11 deletions test/bin/common_versions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,22 +142,40 @@ export CNCF_SYSTEMD_LOGS_VERSION=v0.4
export GITOPS_VERSION=1.16

# The brew release versions needed for release regression testing
BREW_Y0_RELEASE_VERSION="$(get_vrel_from_rpm "${BREW_RPM_SOURCE}/4.${MINOR_VERSION}-zstream/${UNAME_M}/")"
BREW_Y1_RELEASE_VERSION="$(get_vrel_from_rpm "${BREW_RPM_SOURCE}/4.${PREVIOUS_MINOR_VERSION}-zstream/${UNAME_M}/")"
BREW_Y2_RELEASE_VERSION="$(get_vrel_from_rpm "${BREW_RPM_SOURCE}/4.${YMINUS2_MINOR_VERSION}-zstream/${UNAME_M}/")"
BREW_RC_RELEASE_VERSION="$(get_vrel_from_rpm "${BREW_RPM_SOURCE}/4.${MINOR_VERSION}-rc/${UNAME_M}/")"
BREW_EC_RELEASE_VERSION="$(get_vrel_from_rpm "${BREW_RPM_SOURCE}/4.${MINOR_VERSION}-ec/${UNAME_M}/")"
BREW_NIGHTLY_RELEASE_VERSION="$(get_vrel_from_rpm "${BREW_RPM_SOURCE}/4.${MINOR_VERSION}-nightly/${UNAME_M}/")"
export BREW_Y0_RELEASE_VERSION
export BREW_Y1_RELEASE_VERSION
export BREW_Y2_RELEASE_VERSION
#
# Version naming convention (for X.Y.Z format where X=major, Y=minor, Z=patch):
# - LATEST_ZSTREAM: Latest z-stream of current minor (e.g., 4.22.7) - for current release testing
# - PREV_ZSTREAM: Previous z-stream of current minor (e.g., 4.22.4) - for previous Z upgrade testing
# - YMINUS1: Latest z-stream of previous minor (e.g., 4.21.26) - for Y-1 upgrade testing
# - YMINUS2: Latest z-stream of Y-2 minor (e.g., 4.20.44) - for Y-2 upgrade testing
#
LATEST_ZSTREAM_VERSION="$(find "${BREW_RPM_SOURCE}" -maxdepth 1 -type d -regex ".*/[45]\.${MINOR_VERSION}\.[0-9]+$" -printf '%f\n' | sort -V | tail -n1 || echo "")"
PREV_ZSTREAM_VERSION="$(find "${BREW_RPM_SOURCE}" -maxdepth 1 -type d -regex ".*/[45]\.${MINOR_VERSION}\.[0-9]+$" -printf '%f\n' | sort -V | head -n1 || echo "")"
YMINUS1_VERSION="$(find "${BREW_RPM_SOURCE}" -maxdepth 1 -type d -regex ".*/[45]\.${PREVIOUS_MINOR_VERSION}\.[0-9]+$" -printf '%f\n' | sort -V | tail -n1 || echo "")"
YMINUS2_VERSION="$(find "${BREW_RPM_SOURCE}" -maxdepth 1 -type d -regex ".*/[45]\.${YMINUS2_MINOR_VERSION}\.[0-9]+$" -printf '%f\n' | sort -V | tail -n1 || echo "")"
RC_VERSION="$(find "${BREW_RPM_SOURCE}" -maxdepth 1 -type d -regex ".*/[45]\.${MINOR_VERSION}\.[0-9]*-rc$" -printf '%f\n' | sort -V | tail -n1 || echo "")"
EC_VERSION="$(find "${BREW_RPM_SOURCE}" -maxdepth 1 -type d -regex ".*/[45]\.${MINOR_VERSION}\.[0-9]*-ec$" -printf '%f\n' | sort -V | tail -n1 || echo "")"
NIGHTLY_VERSION="$(find "${BREW_RPM_SOURCE}" -maxdepth 1 -type d -regex ".*/[45]\.${MINOR_VERSION}\.[0-9]*-nightly$" -printf '%f\n' | sort -V | tail -n1 || echo "")"

BREW_LATEST_ZSTREAM_VERSION="$(get_vrel_from_rpm "${BREW_RPM_SOURCE}/${LATEST_ZSTREAM_VERSION}/${UNAME_M}/")"
BREW_PREV_ZSTREAM_VERSION="$(get_vrel_from_rpm "${BREW_RPM_SOURCE}/${PREV_ZSTREAM_VERSION}/${UNAME_M}/")"
BREW_YMINUS1_VERSION="$(get_vrel_from_rpm "${BREW_RPM_SOURCE}/${YMINUS1_VERSION}/${UNAME_M}/")"
BREW_YMINUS2_VERSION="$(get_vrel_from_rpm "${BREW_RPM_SOURCE}/${YMINUS2_VERSION}/${UNAME_M}/")"
BREW_RC_RELEASE_VERSION="$(get_vrel_from_rpm "${BREW_RPM_SOURCE}/${RC_VERSION}/${UNAME_M}/")"
BREW_EC_RELEASE_VERSION="$(get_vrel_from_rpm "${BREW_RPM_SOURCE}/${EC_VERSION}/${UNAME_M}/")"
BREW_NIGHTLY_RELEASE_VERSION="$(get_vrel_from_rpm "${BREW_RPM_SOURCE}/${NIGHTLY_VERSION}/${UNAME_M}/")"

export BREW_LATEST_ZSTREAM_VERSION
export BREW_PREV_ZSTREAM_VERSION
export BREW_YMINUS1_VERSION
export BREW_YMINUS2_VERSION
export BREW_RC_RELEASE_VERSION
export BREW_EC_RELEASE_VERSION
export BREW_NIGHTLY_RELEASE_VERSION

# Set the release type based on priority: zstream > RC > EC > nightly
if [ -n "${BREW_Y0_RELEASE_VERSION}" ]; then
BREW_LREL_RELEASE_VERSION="${BREW_Y0_RELEASE_VERSION}"
if [ -n "${BREW_LATEST_ZSTREAM_VERSION}" ]; then
BREW_LREL_RELEASE_VERSION="${BREW_LATEST_ZSTREAM_VERSION}"
elif [ -n "${BREW_RC_RELEASE_VERSION}" ]; then
BREW_LREL_RELEASE_VERSION="${BREW_RC_RELEASE_VERSION}"
elif [ -n "${BREW_EC_RELEASE_VERSION}" ]; then
Expand Down
Loading