diff options
| author | Chris Evich <cevich@redhat.com> | 2019-05-02 14:38:59 -0400 |
|---|---|---|
| committer | Chris Evich <cevich@redhat.com> | 2019-05-21 08:44:02 -0400 |
| commit | 1a2055ffac8b3673e0d1a4062ae64a87cb4f404f (patch) | |
| tree | ce61f2091b80f684c542a491c8fcb7b07039f4fe /contrib/cirrus/packer/Makefile | |
| parent | 95141f88d4e6f994c2972a63be19c82ef759ea5b (diff) | |
| download | podman-1a2055ffac8b3673e0d1a4062ae64a87cb4f404f.tar.gz podman-1a2055ffac8b3673e0d1a4062ae64a87cb4f404f.tar.bz2 podman-1a2055ffac8b3673e0d1a4062ae64a87cb4f404f.zip | |
Cirrus: Stub in F30 support
New base-image boots, a cache-image builds, but more work is needed for
it to be prime-time ready. This commit just adds some updates to the
scafolding necessary to build the base-image. Future work will make F30
more of a reality.
Also add log-collection scripts to test image verification task
Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to 'contrib/cirrus/packer/Makefile')
| -rw-r--r-- | contrib/cirrus/packer/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/contrib/cirrus/packer/Makefile b/contrib/cirrus/packer/Makefile index 0ae0deca6..d03d22abe 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.2 +PACKER_VER ?= 1.3.5 GOARCH=$(shell go env GOARCH) ARCH=$(uname -m) PACKER_DIST_FILENAME := packer_${PACKER_VER}_linux_${GOARCH}.zip @@ -79,6 +79,9 @@ endif ifndef GOOGLE_APPLICATION_CREDENTIALS $(error GOOGLE_APPLICATION_CREDENTIALS is undefined, expected absolute path to JSON file, like $HOME/.config/gcloud/legacy_credentials/*/adc.json) endif +ifndef PACKER_BUILDS + $(error PACKER_BUILDS is undefined, expected builder-names CSV) +endif PACKER_CACHE_DIR=/tmp ./packer build \ -force \ -var TIMESTAMP=$(TIMESTAMP) \ @@ -88,6 +91,5 @@ endif -var GOSRC=$(GOSRC) \ -var PACKER_BASE=$(PACKER_BASE) \ -var SCRIPT_BASE=$(SCRIPT_BASE) \ - -var POST_MERGE_BUCKET_SUFFIX=$(POST_MERGE_BUCKET_SUFFIX) \ -only $(PACKER_BUILDS) \ libpod_base_images.json |