Serialize tooling container build

Normally this would run slightly slower, but since cache is also
improved, runtime should actually be improved.  It also has the
side-benefit of not constantly rebuilding the 'imgts' base image.

Signed-off-by: Chris Evich <[email protected]>

.cirrus.yml

@@ -106,44 +106,29 @@ container_images_task: &container_images
         folder: "/tmp/automation_images_tmp/.cache/**"
         fingerprint_key: "${TARGET_NAME}-cache-version-1"
 
+
 tooling_images_task:
     alias: tooling_images
+    name: 'Build Tooling images'
     only_if: $CIRRUS_CRON == ''
     skip: &ci_docs $CIRRUS_CHANGE_TITLE =~ '.*CI:DOCS.*'
     depends_on:
         - validate
     timeout_in: 30m
     gce_instance: *ibi_vm
-    matrix:
-        - name: &tooling_name "Tooling ${TARGET_NAME} image"
-          env:
-            TARGET_NAME: 'imgts'
-            DEST_FQIN: &tooling_fqin 'quay.io/libpod/${TARGET_NAME}:c$IMG_SFX'
-        - name: *tooling_name
-          env:
-            TARGET_NAME: 'imgobsolete'
-            DEST_FQIN: *tooling_fqin
-        - name: *tooling_name
-          env:
-            TARGET_NAME: 'imgprune'
-            DEST_FQIN: *tooling_fqin
-        - name: *tooling_name
-          env:
-            TARGET_NAME: 'gcsupld'
-            DEST_FQIN: *tooling_fqin
-        - name: *tooling_name
-          env:
-            TARGET_NAME: 'get_ci_vm'
-            DEST_FQIN: *tooling_fqin
-        - name: *tooling_name
-          env:
-            TARGET_NAME: 'orphanvms'
-            DEST_FQIN: *tooling_fqin
     env:
         <<: *image_env
+        TARGET_NAMES: imgts imgobsolete imgprune gcsupld get_ci_vm orphanvms
         PUSH_LATEST: 1  # scripts force to 0 if $CIRRUS_PR
-    script: ci/make_container_images.sh;
-    package_cache: *package_cache
+    script: |
+        for TARGET_NAME in $TARGET_NAMES; do
+            export TARGET_NAME
+            export DEST_FQIN="quay.io/libpod/${TARGET_NAME}:c${IMG_SFX}";
+            ci/make_container_images.sh;
+        done
+    package_cache:
+        folder: "/tmp/automation_images_tmp/.cache/**"
+        fingerprint_key: "tooling-cache-version-1"
 
 
 base_images_task: