Cirrus: fixups based on review feedback

Also remove disused distros (RHEL/CentOS/FAH) and fix get_ci_vm script

Signed-off-by: Chris Evich <cevich@redhat.com>

1 files changed, 0 insertions, 18 deletions

diff --git a/contrib/cirrus/packer/libpod_images.yml b/contrib/cirrus/packer/libpod_images.yml
index 5c42fdae1..722d912c2 100644
--- a/contrib/cirrus/packer/libpod_images.yml
+++ b/contrib/cirrus/packer/libpod_images.yml
@@ -3,12 +3,9 @@
 # All of these are required
 variables:
     # Names of GCE Base images to start from, in .cirrus.yml
-    RHEL_BASE_IMAGE: '{{env `RHEL_BASE_IMAGE`}}'
-    CENTOS_BASE_IMAGE: '{{env `CENTOS_BASE_IMAGE`}}'
     UBUNTU_BASE_IMAGE: '{{env `UBUNTU_BASE_IMAGE`}}'
     FEDORA_BASE_IMAGE: '{{env `FEDORA_BASE_IMAGE`}}'
     PRIOR_FEDORA_BASE_IMAGE: '{{env `PRIOR_FEDORA_BASE_IMAGE`}}'
-    FAH_BASE_IMAGE: '{{env `FAH_BASE_IMAGE`}}'
 
     # libpod dependencies to build and install into images
     FEDORA_CNI_COMMIT: "{{env `FEDORA_CNI_COMMIT`}}"
@@ -25,7 +22,6 @@ variables:
     # Protected credentials, decrypted by Cirrus at runtime
     GCE_SSH_USERNAME: '{{env `GCE_SSH_USERNAME`}}'
     GCP_PROJECT_ID: '{{env `GCP_PROJECT_ID`}}'
-    RHSM_COMMAND: '{{env `RHSM_COMMAND`}}'
     SERVICE_ACCOUNT: '{{env `SERVICE_ACCOUNT`}}'
     GOOGLE_APPLICATION_CREDENTIALS: '{{env `GOOGLE_APPLICATION_CREDENTIALS`}}'
 
@@ -37,7 +33,6 @@ variables:
 sensitive-variables:
     - 'GCE_SSH_USERNAME'
     - 'GCP_PROJECT_ID'
-    - 'RHSM_COMMAND'
     - 'SERVICE_ACCOUNT'
 
 # What images to produce in which cloud
@@ -60,14 +55,6 @@ builders:
 
     #      v----- is a YAML alias, allows partial re-use of the anchor object
     - <<: *gce_hosted_image
-      name: 'rhel-7'
-      source_image: '{{user `RHEL_BASE_IMAGE`}}'
-
-    - <<: *gce_hosted_image
-      name: 'centos-7'
-      source_image: '{{user `CENTOS_BASE_IMAGE`}}'
-
-    - <<: *gce_hosted_image
       name: 'fedora-29'
       source_image: '{{user `FEDORA_BASE_IMAGE`}}'
 
@@ -75,10 +62,6 @@ builders:
       name: 'fedora-28'
       source_image: '{{user `PRIOR_FEDORA_BASE_IMAGE`}}'
 
-    - <<: *gce_hosted_image
-      name: 'fah-29'
-      source_image: '{{user `FAH_BASE_IMAGE`}}'
-
 # The brains of the operation, making actual modifications to the base-image.
 provisioners:
     - type: 'file'
@@ -95,7 +78,6 @@ provisioners:
           - 'CRIU_COMMIT={{user `CRIU_COMMIT`}}'
           - 'RUNC_COMMIT={{user `RUNC_COMMIT`}}'
           - 'SCRIPT_BASE={{user `SCRIPT_BASE`}}'
-          - 'RHSM_COMMAND={{user `RHSM_COMMAND`}}'
 
 post-processors:
     - - type: 'manifest'  # writes packer-manifest.json