DO NOT MERGE: testing

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

.cirrus.yml

@@ -40,9 +40,7 @@ image_builder_task:
     name: "Image-builder image"
     alias: "image_builder"
     only_if: *is_pr
-    skip: &ci_docs_tooling |
-        $CIRRUS_CHANGE_TITLE =~ '.*CI:DOCS.*' ||
-        $CIRRUS_CHANGE_TITLE =~ '.*CI:TOOLING.*'
+    skip: $CI == $CI
     depends_on:
         - validate
     # Packer needs time to clean up partially created VM images
@@ -68,7 +66,7 @@ image_builder_task:
 container_images_task: &container_images
     alias: "container_images"
     only_if: *is_pr
-    skip: *ci_docs_tooling
+    skip: $CI == $CI
     depends_on:
         - image_builder
     timeout_in: 30m
@@ -110,7 +108,7 @@ tooling_images_task:
     alias: tooling_images
     name: 'Build Tooling images'
     only_if: $CIRRUS_CRON == ''
-    skip: &ci_docs $CIRRUS_CHANGE_TITLE =~ '.*CI:DOCS.*'
+    skip: $CI == $CI
     depends_on:
         - validate
     # TODO: This should not take this long, but it can :(
@@ -135,7 +133,6 @@ base_images_task:
     name: "Build VM Base-images"
     alias: "base_images"
     only_if: *is_pr
-    skip: *ci_docs_tooling
     depends_on:
         - container_images
     # Packer needs time to clean up partially created VM images
@@ -154,12 +151,6 @@ base_images_task:
           name: "${PACKER_BUILDS} Base Image"
           env:
             PACKER_BUILDS: "fedora"
-        - <<: *base_image
-          env:
-            PACKER_BUILDS: "prior-fedora"
-        - <<: *base_image
-          env:
-            PACKER_BUILDS: "ubuntu"
     env:
       GAC_JSON: ENCRYPTED[7fba7fb26ab568ae39f799ab58a476123206576b0135b3d1019117c6d682391370c801e149f29324ff4b50133012aed9]
     script: "ci/make_base_images.sh"
@@ -172,7 +163,6 @@ cache_images_task:
     name: "Build VM Cache-images"
     alias: "cache_images"
     only_if: *is_pr
-    skip: *ci_docs_tooling
     depends_on:
         - base_images
     # Packer needs time to clean up partially created VM images
@@ -188,18 +178,6 @@ cache_images_task:
     matrix:
         - &cache_image
           name: "${PACKER_BUILDS} Cache Image"
-          env:
-            PACKER_BUILDS: "fedora"
-        - <<: *cache_image
-          env:
-            PACKER_BUILDS: "prior-fedora"
-        - <<: *cache_image
-          env:
-            PACKER_BUILDS: "fedora-netavark"
-        - <<: *cache_image
-          env:
-            PACKER_BUILDS: "ubuntu"
-        - <<: *cache_image
           env:
             PACKER_BUILDS: "build-push"
     env:
@@ -215,7 +193,7 @@ imgts_task:
     name: "Apply new image metadata"
     alias: imgts
     only_if: *is_pr
-    skip: *ci_docs_tooling
+    skip: $CI == $CI
     depends_on:
         - cache_images
     container:
@@ -246,7 +224,7 @@ test_imgobsolete_task: &lifecycle_test
     name: "Test old images obsolete marking"
     alias: test_imgobsolete
     only_if: &not_cron $CIRRUS_CRON == ''
-    skip: *ci_docs
+    skip: $CI == $CI
     depends_on:
         - tooling_images
         - imgts
@@ -267,7 +245,7 @@ test_imgprune_task:
     <<: *lifecycle_test
     name: "Test obsolete image deletion"
     alias: test_imgprune
-    skip: *ci_docs
+    skip: $CI == $CI
     depends_on:
         - tooling_images
         - imgts
@@ -279,7 +257,7 @@ test_gcsupld_task:
     name: "Test uploading to GCS"
     alias: test_gcsupld
     only_if: *not_cron
-    skip: *ci_docs
+    skip: $CI == $CI
     depends_on:
         - tooling_images
         - imgts
@@ -298,7 +276,7 @@ test_get_ci_vm_task:
     name: "Test get_ci_vm entrypoint"
     alias: test_get_ci_vm
     only_if: *not_cron
-    skip: *ci_docs
+    skip: $CI == $CI
     depends_on:
         - tooling_images
         - imgts
@@ -336,6 +314,7 @@ cron_imgobsolete_task: &lifecycle_cron
     name: "Periodicly mark old images obsolete"
     alias: cron_imgobsolete
     only_if: $CIRRUS_PR == '' && $CIRRUS_CRON != ''
+    skip: $CI == $CI
     container:
         image: 'quay.io/libpod/imgobsolete:latest'
         cpu: 2
@@ -350,6 +329,7 @@ cron_imgprune_task:
     <<: *lifecycle_cron
     name: "Periodicly delete obsolete images"
     alias: cron_imgprune
+    skip: $CI == $CI
     depends_on:
         - cron_imgobsolete
     container: