diff options
| author | Chris Evich <cevich@redhat.com> | 2019-08-28 12:39:36 -0400 |
|---|---|---|
| committer | Chris Evich <cevich@redhat.com> | 2020-02-25 12:34:24 -0500 |
| commit | e0ca4a22604cd8b359328fb56a5499d3e1a36157 (patch) | |
| tree | 950b97f3facaa9fb78189b60df613c7a342160a6 /contrib/cirrus/packer/Makefile | |
| parent | 3d37dc639d87e4469a6457cf4592ff5b773d0777 (diff) | |
| download | podman-e0ca4a22604cd8b359328fb56a5499d3e1a36157.tar.gz podman-e0ca4a22604cd8b359328fb56a5499d3e1a36157.tar.bz2 podman-e0ca4a22604cd8b359328fb56a5499d3e1a36157.zip | |
Cirrus: Support testing with F31
Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to 'contrib/cirrus/packer/Makefile')
| -rw-r--r-- | contrib/cirrus/packer/Makefile | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/contrib/cirrus/packer/Makefile b/contrib/cirrus/packer/Makefile index fa87d7019..a911cafdb 100644 --- a/contrib/cirrus/packer/Makefile +++ b/contrib/cirrus/packer/Makefile @@ -1,9 +1,4 @@ - -# N/B: PACKER_BUILDS variable is required. Should contain CSV of -# builder name(s) from applicable YAML file, -# e.g for names see libpod_images.yml - -PACKER_VER ?= 1.4.2 +PACKER_VER ?= 1.4.3 GOARCH=$(shell go env GOARCH) ARCH=$(uname -m) PACKER_DIST_FILENAME := packer_${PACKER_VER}_linux_${GOARCH}.zip @@ -56,8 +51,9 @@ test: libpod_base_images.json libpod_images.json packer .PHONY: libpod_images libpod_images: guard-PACKER_BUILDS libpod_images.json packer - ./packer build -only=${PACKER_BUILDS} \ + ./packer build \ -force \ + $(shell test -z "${PACKER_BUILDS}" || echo "-only=${PACKER_BUILDS}") \ -var GOSRC=$(GOSRC) \ -var PACKER_BASE=$(PACKER_BASE) \ -var SCRIPT_BASE=$(SCRIPT_BASE) \ @@ -82,6 +78,7 @@ cidata.iso: user-data meta-data .PHONY: libpod_base_images libpod_base_images: guard-GCP_PROJECT_ID guard-GOOGLE_APPLICATION_CREDENTIALS libpod_base_images.json cidata.iso cidata.ssh packer PACKER_CACHE_DIR=/tmp ./packer build \ + $(shell test -z "${PACKER_BUILDS}" || echo "-only=${PACKER_BUILDS}") \ -force \ -var TIMESTAMP=$(TIMESTAMP) \ -var TTYDEV=$(TTYDEV) \ |