Cirrus: Consolidate VM image names in once place

Previously it was not possible to specify keys from the ``env`` section
in the various GCE sections.  Now that features is added, consolidate
all the cache image definitions into a single place, reducing
maintenance burden.

This also results in the names passing through into the VMs. This is
useful, e.g. for future tracking of image usage statistics.

Update get_ci_vm script hints for new image name definition format

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

1 files changed, 8 insertions, 4 deletions

diff --git a/hack/get_ci_vm.sh b/hack/get_ci_vm.sh
index e1d8e42b9..b058b4273 100755
--- a/hack/get_ci_vm.sh
+++ b/hack/get_ci_vm.sh
@@ -54,15 +54,19 @@ delvm() {
     showrun $CLEANUP_CMD  # prompts for Yes/No
 }
 
-show_usage(){
+image_hints() {
+    egrep '[[:space:]]+[[:alnum:]].+_CACHE_IMAGE_NAME:[[:space:]+"[[:print:]]+"' \
+        "$LIBPODROOT/.cirrus.yml" | cut -d: -f 2 | tr -d '"[:blank:]' | \
+        grep -v 'notready' | grep -v 'image-builder' | sort -u
+}
+
+show_usage() {
     echo -e "\n${RED}ERROR: $1${NOR}"
     echo -e "${YEL}Usage: $(basename $0) [-s | -p] <image_name>${NOR}\n"
     if [[ -r ".cirrus.yml" ]]
     then
-        egrep 'image_name' ".cirrus.yml" | grep -v '#' | cut -d: -f 2 | \
-            tr -d [:blank:] | sort -u > "$TEMPFILE"
         echo -e "${YEL}Some possible image_name values (from .cirrus.yml):${NOR}"
-        cat $TEMPFILE
+        image_hints
         echo ""
     fi
     exit 1