diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-02-25 21:32:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-25 21:32:20 +0100 |
| commit | 6c5591ed9d89494e166ef0ffa8a1ff36333d1a1b (patch) | |
| tree | 485ed1b7ce86431008b4ff47709982a23dff6639 /contrib/cirrus/packer/Makefile | |
| parent | 6a03a9a538804b406c34e75a2333045b9f7db7d5 (diff) | |
| parent | 80da73f13c69fa84055a317cb59f3a5eb1ffa09c (diff) | |
| download | podman-6c5591ed9d89494e166ef0ffa8a1ff36333d1a1b.tar.gz podman-6c5591ed9d89494e166ef0ffa8a1ff36333d1a1b.tar.bz2 podman-6c5591ed9d89494e166ef0ffa8a1ff36333d1a1b.zip | |
Merge pull request #3901 from cevich/support_f31
Cirrus: Support testing with F31
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) \ |