From 3d0dfc1ae25845a19ffd7866a98437eb81e4b66b Mon Sep 17 00:00:00 2001 From: Mike Graves Date: Thu, 16 Sep 2021 15:00:37 -0400 Subject: [PATCH] Replace IMAGE_FORMAT env var (#108) The IMAGE_FORMAT env var has been deprecated and removed. This adds a new env var that will be set upstream in the openshift CI config. --- ci/incluster_integration.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ci/incluster_integration.sh b/ci/incluster_integration.sh index 571eef9..1480124 100755 --- a/ci/incluster_integration.sh +++ b/ci/incluster_integration.sh @@ -13,7 +13,11 @@ NAMESPACE=${NAMESPACE:-default} # would resolve to quay.io/mynamespace/molecule-test-runner # shellcheck disable=SC2034 component='molecule-test-runner' -eval IMAGE="$IMAGE_FORMAT" +if [[ ! -z "${MOLECULE_IMAGE}" ]]; then + IMAGE="${MOLECULE_IMAGE}" +else + IMAGE="${IMAGE_FORMAT}" +fi PULL_POLICY=${PULL_POLICY:-IfNotPresent} @@ -84,4 +88,5 @@ do sleep 10 done +oc logs job/molecule-integration-test exit 1