Skip to content

Commit 3e6083d

Browse files
committed
Allow overriding OPENSHIFT_RELEASE_TAG
The current auto-detection logic does not work at all when quay.io images are used (a custom payload).
1 parent 9d1a83c commit 3e6083d

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

common.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ if [[ -z "$OPENSHIFT_CI" ]]; then
172172
export OPENSHIFT_VERSION=${OPENSHIFT_VERSION:-$(echo $OPENSHIFT_RELEASE_IMAGE | sed "s/.*:\([[:digit:]]\.[[:digit:]]*\).*/\1/")}
173173
fi
174174

175-
export OPENSHIFT_RELEASE_TAG=$(echo $OPENSHIFT_RELEASE_IMAGE | sed -E 's/[[:alnum:]\/.-]*(release|okd).*://')
175+
export OPENSHIFT_RELEASE_TAG=${OPENSHIFT_RELEASE_TAG:-$(echo $OPENSHIFT_RELEASE_IMAGE | sed -E 's/[[:alnum:]\/.-]*(release|okd).*://')}
176176

177177
# Use "ipmi" for 4.3 as it didn't support redfish, for other versions
178178
# use "redfish", unless its CI where we use "mixed"

config_example.sh

+7
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,13 @@ set -x
5454
# export OPENSHIFT_RELEASE_IMAGE=registry.ci.openshift.org/origin/release:4.15.0-0.okd-2023-08-29-101209
5555
# Default: Undefined
5656

57+
# OPENSHIFT_RELEASE_TAG -
58+
# Define a specific release tag to use. Only required if OPENSHIFT_RELEASE_IMAGE
59+
# does not come from registry.ci.openshift.org (e.g. a custom payload on quay).
60+
# For example:
61+
# export OPENSHIFT_RELEASE_TAG=4.15.0-0.okd-2023-08-29-101209-custom
62+
# Default: defined from OPENSHIFT_RELEASE_IMAGE
63+
5764
# OPENSHIFT_VERSION -
5865
# Set the Openshift version. If unset defaults to $OPENSHIFT_RELEASE_STREAM.
5966
# NOTE: Do not use for arm64, instead override OPENSHIFT_RELEASE_IMAGE

0 commit comments

Comments
 (0)