Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions test/bin/common_versions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -109,16 +109,16 @@ export CURRENT_RELEASE_VERSION
# For a release branch, the previous release repository should come from the
# official 'rhocp' stream.# The previous release repository value should either
# point to the OpenShift mirror URL or the 'rhocp' repository name.
PREVIOUS_RELEASE_REPO="rhocp-4.22-for-rhel-9-${UNAME_M}-rpms"
PREVIOUS_RELEASE_VERSION="$(get_vrel_from_rhsm "${PREVIOUS_RELEASE_REPO}")"
PREVIOUS_RELEASE_REPO="https://mirror.openshift.com/pub/openshift-v4/${UNAME_M}/microshift/ocp/latest-4.22/el9/os"
PREVIOUS_RELEASE_VERSION="$(get_vrel_from_beta "${PREVIOUS_RELEASE_REPO}")"
export PREVIOUS_RELEASE_REPO
export PREVIOUS_RELEASE_VERSION

# The y-2 release repository value should either point to the OpenShift
# mirror URL or the 'rhocp' repository name. It should always come from
# the 'rhocp' stream.
YMINUS2_RELEASE_REPO="rhocp-4.21-for-rhel-9-${UNAME_M}-rpms"
YMINUS2_RELEASE_VERSION="$(get_vrel_from_rhsm "${YMINUS2_RELEASE_REPO}")"
YMINUS2_RELEASE_REPO="https://mirror.openshift.com/pub/openshift-v4/${UNAME_M}/microshift/ocp/latest-4.21/el9/os"
YMINUS2_RELEASE_VERSION="$(get_vrel_from_beta "${YMINUS2_RELEASE_REPO}")"
export YMINUS2_RELEASE_REPO
export YMINUS2_RELEASE_VERSION

Expand All @@ -138,8 +138,8 @@ export RHOCP_MINOR_Y_BETA
# 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=4
RHOCP_MINOR_Y1=22
RHOCP_MAJOR_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.
Expand All @@ -152,13 +152,13 @@ export RHOCP_MINOR_Y1_BETA
export RHOCP_MAJOR_Y2=4
export RHOCP_MINOR_Y2=21

export CNCF_SONOBUOY_VERSION=v0.57.3
export CNCF_SONOBUOY_VERSION=v0.57.5

# The version of systemd-logs image included in the sonobuoy release.
export CNCF_SYSTEMD_LOGS_VERSION=v0.4

# The current version of the microshift-gitops package.
export GITOPS_VERSION=1.19
export GITOPS_VERSION=1.21

# The brew release versions needed for release regression testing
BREW_Y0_RELEASE_VERSION="$(get_vrel_from_rpm "${BREW_RPM_SOURCE}/${MAJOR_VERSION}.${MINOR_VERSION}-zstream/${UNAME_M}/")"
Expand Down
2 changes: 1 addition & 1 deletion test/bin/pyutils/generate_common_versions.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

# The version of Sonobuoy package used in CNCF tests.
# See https://github.com/vmware-tanzu/sonobuoy/releases.
CNCF_SONOBUOY_VERSION = "v0.57.3"
CNCF_SONOBUOY_VERSION = "v0.57.5"

# The version of systemd-logs image included in the sonobuoy release.
CNCF_SYSTEMD_LOGS_VERSION = "v0.4"
Expand Down