diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-02-01 03:23:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-01 03:23:24 +0100 |
| commit | 82550ede36dab0689914c3c1b6de44b55f0d22f8 (patch) | |
| tree | fcf56d191459ea7661c305f4dff91e0fae2e876b /contrib/cirrus/packer/Makefile | |
| parent | 805c6d997b4eb8941e7c2a12879bf9a5284835d0 (diff) | |
| parent | 10d749b9a8c36ce5d3e2dc904222863528c349f6 (diff) | |
| download | podman-82550ede36dab0689914c3c1b6de44b55f0d22f8.tar.gz podman-82550ede36dab0689914c3c1b6de44b55f0d22f8.tar.bz2 podman-82550ede36dab0689914c3c1b6de44b55f0d22f8.zip | |
Merge pull request #2195 from cevich/rhel7-testing
Cirrus: Add RHEL-7 testing
Diffstat (limited to 'contrib/cirrus/packer/Makefile')
| -rw-r--r-- | contrib/cirrus/packer/Makefile | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/contrib/cirrus/packer/Makefile b/contrib/cirrus/packer/Makefile index 9bf27373e..0a783e979 100644 --- a/contrib/cirrus/packer/Makefile +++ b/contrib/cirrus/packer/Makefile @@ -3,7 +3,7 @@ # builder name(s) from applicable YAML file, # e.g for names see libpod_images.yml -PACKER_VER ?= 1.3.1 +PACKER_VER ?= 1.3.2 PACKER_DIST_FILENAME := packer_${PACKER_VER}_linux_amd64.zip # Only needed for libpod_base_images target @@ -11,6 +11,7 @@ TIMESTAMP := $(shell date +%s) GOSRC ?= $(shell realpath "./../../../") PACKER_BASE ?= contrib/cirrus/packer SCRIPT_BASE ?= contrib/cirrus +POST_MERGE_BUCKET_SUFFIX ?= # For debugging nested-virt, use #TTYDEV := $(shell tty) @@ -50,10 +51,6 @@ endif -var PACKER_BASE=$(PACKER_BASE) \ -var SCRIPT_BASE=$(SCRIPT_BASE) \ libpod_images.json - @echo "" - @echo "Finished. The images mentioned above, and in packer-manifest.json" - @echo "can be used in .cirrus.yml as values for the 'image_name' keys" - @echo "" cidata.ssh: ssh-keygen -f $@ -P "" -q @@ -100,9 +97,6 @@ endif -var RHEL_IMAGE_FILE=$(RHEL_IMAGE_FILE) \ -var RHEL_CSUM_FILE=$(RHEL_CSUM_FILE) \ -var 'RHSM_COMMAND=$(RHSM_COMMAND)' \ + -var POST_MERGE_BUCKET_SUFFIX=$(POST_MERGE_BUCKET_SUFFIX) \ -only $(PACKER_BUILDS) \ libpod_base_images.json - @echo "" - @echo "Finished. The images mentioned above, and in packer-manifest.json" - @echo "can be used in .cirrus.yml as values for the *_BASE_IMAGE keys." - @echo "" |