summaryrefslogtreecommitdiff
path: root/contrib/cirrus/build_vm_images.sh
diff options
context:
space:
mode:
authorChris Evich <cevich@redhat.com>2019-03-22 09:44:03 -0400
committerChris Evich <cevich@redhat.com>2019-05-21 08:44:02 -0400
commitc4d9b03f7800e37df0a8821b450932700aac3c5d (patch)
tree92c6d1478d0bb15cc5944c4d9e2fe25aaa003c08 /contrib/cirrus/build_vm_images.sh
parent51a95e6ef1b4616f308d0a7a5507c2ece74a9f0f (diff)
downloadpodman-c4d9b03f7800e37df0a8821b450932700aac3c5d.tar.gz
podman-c4d9b03f7800e37df0a8821b450932700aac3c5d.tar.bz2
podman-c4d9b03f7800e37df0a8821b450932700aac3c5d.zip
Cirrus: Overhaul/Simplify env. var setup
Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to 'contrib/cirrus/build_vm_images.sh')
-rwxr-xr-xcontrib/cirrus/build_vm_images.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/contrib/cirrus/build_vm_images.sh b/contrib/cirrus/build_vm_images.sh
index cfdfd5d7d..773f8e486 100755
--- a/contrib/cirrus/build_vm_images.sh
+++ b/contrib/cirrus/build_vm_images.sh
@@ -3,7 +3,10 @@
set -e
source $(dirname $0)/lib.sh
-req_env_var CNI_COMMIT CRIO_COMMIT RUNC_COMMIT PACKER_BUILDS BUILT_IMAGE_SUFFIX CENTOS_BASE_IMAGE UBUNTU_BASE_IMAGE FEDORA_BASE_IMAGE FAH_BASE_IMAGE RHEL_BASE_IMAGE RHSM_COMMAND SERVICE_ACCOUNT GCE_SSH_USERNAME GCP_PROJECT_ID PACKER_VER SCRIPT_BASE PACKER_BASE
+ENV_VARS='CNI_COMMIT CRIO_COMMIT RUNC_COMMIT PACKER_BUILDS BUILT_IMAGE_SUFFIX CENTOS_BASE_IMAGE UBUNTU_BASE_IMAGE FEDORA_BASE_IMAGE PRIOR_FEDORA_BASE_IMAGE FAH_BASE_IMAGE RHEL_BASE_IMAGE RHSM_COMMAND SERVICE_ACCOUNT GCE_SSH_USERNAME GCP_PROJECT_ID PACKER_VER SCRIPT_BASE PACKER_BASE'
+req_env_var $ENV_VARS
+# Must also be made available through make, into packer process
+export $ENV_VARS
show_env_vars