Merge pull request openshift-metal3#865 from yrobla/master

Steven Hardy · web-flow · commit 55efa841840b · 2019-12-17T14:00:23.000Z
Do not curl for release image if we provide it
diff --git a/common.sh b/common.sh
@@ -41,7 +41,10 @@ export LOCAL_REGISTRY_ADDRESS=${LOCAL_REGISTRY_ADDRESS:-"192.168.111.1:5000"}
 #
 # See https://openshift-release.svc.ci.openshift.org for release details
 #
-LATEST_CI_IMAGE=$(curl https://openshift-release.svc.ci.openshift.org/api/v1/releasestream/4.4.0-0.ci/latest | grep -o 'registry.svc.ci.openshift.org[^"]\+')
+# if we provide OPENSHIFT_RELEASE_IMAGE, do not curl. This is needed for offline installs
+if [ -z "${OPENSHIFT_RELEASE_IMAGE}" ]; then
+  LATEST_CI_IMAGE=$(curl https://openshift-release.svc.ci.openshift.org/api/v1/releasestream/4.4.0-0.ci/latest | grep -o 'registry.svc.ci.openshift.org[^"]\+')
+fi
 export OPENSHIFT_RELEASE_IMAGE="${OPENSHIFT_RELEASE_IMAGE:-$LATEST_CI_IMAGE}"
 export OPENSHIFT_INSTALL_PATH="$GOPATH/src/github.com/openshift/installer"
 

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,10 @@ export LOCAL_REGISTRY_ADDRESS=${LOCAL_REGISTRY_ADDRESS:-"192.168.111.1:5000"}`
`41`	`41`	`#`
`42`	`42`	`# See https://openshift-release.svc.ci.openshift.org for release details`
`43`	`43`	`#`
`44`		`-LATEST_CI_IMAGE=$(curl https://openshift-release.svc.ci.openshift.org/api/v1/releasestream/4.4.0-0.ci/latest \| grep -o 'registry.svc.ci.openshift.org[^"]\+')`
	`44`	`+# if we provide OPENSHIFT_RELEASE_IMAGE, do not curl. This is needed for offline installs`
	`45`	`+if [ -z "${OPENSHIFT_RELEASE_IMAGE}" ]; then`
	`46`	`+ LATEST_CI_IMAGE=$(curl https://openshift-release.svc.ci.openshift.org/api/v1/releasestream/4.4.0-0.ci/latest \| grep -o 'registry.svc.ci.openshift.org[^"]\+')`
	`47`	`+fi`
`45`	`48`	`export OPENSHIFT_RELEASE_IMAGE="${OPENSHIFT_RELEASE_IMAGE:-$LATEST_CI_IMAGE}"`
`46`	`49`	`export OPENSHIFT_INSTALL_PATH="$GOPATH/src/github.com/openshift/installer"`
`47`	`50`