diff options
| author | Chris Evich <cevich@redhat.com> | 2019-05-07 13:31:04 -0400 |
|---|---|---|
| committer | Chris Evich <cevich@redhat.com> | 2019-06-14 13:41:58 -0400 |
| commit | 11484580d35c7310242303fa0728e3681462f37f (patch) | |
| tree | 395230c6548e18f63779e0f98631efe3ac3bed30 /contrib/cirrus/packer/libpod_base_images.yml | |
| parent | 60a857db6293fcf012e218f133c369ec5a8065ba (diff) | |
| download | podman-11484580d35c7310242303fa0728e3681462f37f.tar.gz podman-11484580d35c7310242303fa0728e3681462f37f.tar.bz2 podman-11484580d35c7310242303fa0728e3681462f37f.zip | |
Cirrus: Add support for testing F30
Remove disused `build_cache_images` task, and
update relevant dockerfiles for F30.
Fix problem of cloud-init failing to expand root-device on boot
(/var/lib/cloud/instance left in improper state).
Fix problem of cloud-init racing with google-network-daemon.service on
boot (looking for cloudconfig metadata too early). Causing
root-device to _sometimes_ fail to expand.
Fix problem of hack/get_ci_vm.sh argument passing.
Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to 'contrib/cirrus/packer/libpod_base_images.yml')
| -rw-r--r-- | contrib/cirrus/packer/libpod_base_images.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/cirrus/packer/libpod_base_images.yml b/contrib/cirrus/packer/libpod_base_images.yml index 560cb321c..e519d2fba 100644 --- a/contrib/cirrus/packer/libpod_base_images.yml +++ b/contrib/cirrus/packer/libpod_base_images.yml @@ -78,7 +78,7 @@ builders: ssh_username: 'root' - <<: *nested_virt - name: 'prior-fedora' + name: 'prior_fedora' iso_url: '{{user `PRIOR_FEDORA_IMAGE_URL`}}' iso_checksum_url: '{{user `PRIOR_FEDORA_CSUM_URL`}}' @@ -121,7 +121,7 @@ provisioners: post-processors: - - type: "compress" - only: ['fedora', 'prior-fedora'] + only: ['fedora', 'prior_fedora'] output: '/tmp/{{build_name}}/disk.raw.tar.gz' format: '.tar.gz' compression_level: 9 @@ -136,7 +136,7 @@ post-processors: image_description: 'Based on {{user `FEDORA_IMAGE_URL`}}' image_family: '{{user `FEDORA_BASE_IMAGE_NAME`}}' - <<: *gcp_import - only: ['prior-fedora'] + only: ['prior_fedora'] image_name: "{{user `PRIOR_FEDORA_BASE_IMAGE_NAME`}}-{{user `TIMESTAMP`}}" image_description: 'Based on {{user `PRIOR_FEDORA_IMAGE_URL`}}' image_family: '{{user `PRIOR_FEDORA_BASE_IMAGE_NAME`}}' |