Skip to content

Commit a037780

Browse files
author
Steven Hardy
authoredJul 22, 2020
Add OPENSHIFT_RELEASE_TYPE variable (#1070)
We've been seeing different behavior between the ci and nightly builds, so this makes it easier to switch between them to compare, e.g to deploy latest nightly export OPENSHIFT_RELEASE_TYPE=nightly
1 parent cb17707 commit a037780

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed
 

‎common.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,8 @@ export KNI_INSTALL_FROM_GIT=${KNI_INSTALL_FROM_GIT:-}
211211
# if we provide OPENSHIFT_RELEASE_IMAGE, do not curl. This is needed for offline installs
212212
if [ -z "${OPENSHIFT_RELEASE_IMAGE:-}" ]; then
213213
OPENSHIFT_RELEASE_STREAM=${OPENSHIFT_RELEASE_STREAM:-4.6}
214-
LATEST_CI_IMAGE=$(curl -L https://openshift-release.svc.ci.openshift.org/api/v1/releasestream/${OPENSHIFT_RELEASE_STREAM}.0-0.ci/latest | grep -o 'registry.svc.ci.openshift.org[^"]\+')
214+
OPENSHIFT_RELEASE_TYPE=${OPENSHIFT_RELEASE_TYPE:-ci}
215+
LATEST_CI_IMAGE=$(curl -L https://openshift-release.svc.ci.openshift.org/api/v1/releasestream/${OPENSHIFT_RELEASE_STREAM}.0-0.${OPENSHIFT_RELEASE_TYPE}/latest | grep -o 'registry.svc.ci.openshift.org[^"]\+')
215216
fi
216217
export OPENSHIFT_RELEASE_IMAGE="${OPENSHIFT_RELEASE_IMAGE:-$LATEST_CI_IMAGE}"
217218
export OPENSHIFT_INSTALL_PATH="$GOPATH/src/github.com/openshift/installer"

‎config_example.sh

+4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ set -x
99
# image name is not specified
1010
#export OPENSHIFT_RELEASE_STREAM=4.6
1111

12+
# Select a different release type from which to pull the latest image,
13+
# e.g ci or nightly
14+
#export OPENSHIFT_RELEASE_TYPE=ci
15+
1216
# Use <NAME>_LOCAL_IMAGE to build or use copy of container images locally e.g.
1317
#export IRONIC_INSPECTOR_LOCAL_IMAGE=https://github.com/metal3-io/ironic-inspector
1418
#export IRONIC_LOCAL_IMAGE=quay.io/username/ironic

0 commit comments

Comments
 (0)
Please sign in to comment.