Merge pull request #3754 from cevich/latest_ubuntu

Add support for testing with the latest Ubuntu release

1 files changed, 18 insertions, 8 deletions

diff --git a/contrib/cirrus/packer/libpod_images.yml b/contrib/cirrus/packer/libpod_images.yml
index cae5d4138..01a65d867 100644
--- a/contrib/cirrus/packer/libpod_images.yml
+++ b/contrib/cirrus/packer/libpod_images.yml
@@ -2,16 +2,17 @@
 
 # All of these are required
 variables:
-    # Names of GCE Base images to start from, in .cirrus.yml
-    UBUNTU_BASE_IMAGE: '{{env `UBUNTU_BASE_IMAGE`}}'
-    FEDORA_BASE_IMAGE: '{{env `FEDORA_BASE_IMAGE`}}'
-    PRIOR_FEDORA_BASE_IMAGE: '{{env `PRIOR_FEDORA_BASE_IMAGE`}}'
-
     BUILT_IMAGE_SUFFIX: '{{env `BUILT_IMAGE_SUFFIX`}}'
     GOSRC: '{{env `GOSRC`}}'
     PACKER_BASE: '{{env `PACKER_BASE`}}'
     SCRIPT_BASE: '{{env `SCRIPT_BASE`}}'
 
+    # Base-image names are required.  Using image family-names breaks parallelism
+    UBUNTU_BASE_IMAGE: '{{env `UBUNTU_BASE_IMAGE`}}'
+    PRIOR_UBUNTU_BASE_IMAGE: '{{env `PRIOR_UBUNTU_BASE_IMAGE`}}'
+    FEDORA_BASE_IMAGE: '{{env `FEDORA_BASE_IMAGE`}}'
+    PRIOR_FEDORA_BASE_IMAGE: '{{env `PRIOR_FEDORA_BASE_IMAGE`}}'
+
     # Protected credentials, decrypted by Cirrus at runtime
     GCE_SSH_USERNAME: '{{env `GCE_SSH_USERNAME`}}'
     GCP_PROJECT_ID: '{{env `GCP_PROJECT_ID`}}'
@@ -28,11 +29,12 @@ sensitive-variables:
 builders:
     #  v----- is a YAML anchor, allows referencing this object by name (below)
     - &gce_hosted_image
-      name: 'ubuntu-18'
+      name: 'ubuntu-19'
       type: 'googlecompute'
       image_name: '{{build_name}}{{user `BUILT_IMAGE_SUFFIX`}}'
-      image_family: '{{build_name}}-libpod'
-      source_image: '{{user `UBUNTU_BASE_IMAGE`}}'
+      image_family: '{{build_name}}-cache'
+      source_image: '{{user `UBUNTU_BASE_IMAGE`}}'  # precedence over family
+      source_image_family: 'ubuntu-base'  # for ref. only
       disk_size: 20  # REQUIRED: Runtime allocation > this value
       project_id: '{{user `GCP_PROJECT_ID`}}'
       service_account_email: '{{user `SERVICE_ACCOUNT`}}'
@@ -44,16 +46,24 @@ builders:
 
     #      v----- is a YAML alias, allows partial re-use of the anchor object
     - <<: *gce_hosted_image
+      name: 'ubuntu-18'
+      source_image: '{{user `PRIOR_UBUNTU_BASE_IMAGE`}}'
+      source_image_family: 'prior-ubuntu-base'
+
+    - <<: *gce_hosted_image
       name: 'fedora-30'
       source_image: '{{user `FEDORA_BASE_IMAGE`}}'
+      source_image_family: 'fedora-base'
 
     - <<: *gce_hosted_image
       name: 'xfedora-30'
       source_image: '{{user `FEDORA_BASE_IMAGE`}}'
+      source_image_family: 'fedora-base'
 
     - <<: *gce_hosted_image
       name: 'fedora-29'
       source_image: '{{user `PRIOR_FEDORA_BASE_IMAGE`}}'
+      source_image_family: 'prior-fedora-base'
 
 # The brains of the operation, making actual modifications to the base-image.
 provisioners: