From 1189ee38b69a069c3df9d48c26b0f82af8ce7a6a Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Wed, 28 Aug 2019 11:26:10 +0100 Subject: [PATCH] Set installer release image override when running from source This was removed in #758 but it turns out the default origin builds still contain old ironic images, ref discussion on https://github.com/openshift/ironic-inspector-image/pull/17 This means we need to set the installer release image override in the case where export KNI_INSTALL_FROM_GIT=true, or we'll get the default from the openshift/installer source, and that currently won't work. Closes: #775 --- ocp_install_env.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ocp_install_env.sh b/ocp_install_env.sh index b019c2fc1..34885d8a9 100644 --- a/ocp_install_env.sh +++ b/ocp_install_env.sh @@ -69,6 +69,13 @@ function build_installer() { popd export OPENSHIFT_INSTALLER="$OPENSHIFT_INSTALL_PATH/bin/openshift-install" + + # The installer defaults to origin/CI releases, e.g registry.svc.ci.openshift.org/origin/release:4.2 + # Which currently don't work for us ref + # https://github.com/openshift/ironic-inspector-image/pull/17 + # Until we can align OPENSHIFT_RELEASE_IMAGE with the installer default, we still need + # to set OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE for openshift-install source builds + export OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE="${OPENSHIFT_RELEASE_IMAGE}" } function generate_ocp_install_config() {