DO NOT MERGE: Exclusive test-building AWS images

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

.cirrus.yml

@@ -40,10 +40,7 @@ validate_task:
 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  # FIXME: Skip for aws testing
     depends_on:
         - validate
     # Packer needs time to clean up partially created VM images
@@ -68,8 +65,7 @@ image_builder_task:
 
 container_images_task: &container_images
     alias: "container_images"
-    only_if: *is_pr
-    skip: *ci_docs_tooling
+    skip: $CI == $CI  # FIXME: Skip for aws testing
     depends_on:
         - image_builder
     timeout_in: 30m
@@ -110,8 +106,7 @@ container_images_task: &container_images
 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  # FIXME: Skip for aws testing
     depends_on:
         - validate
     # TODO: This should not take this long, but it can :(
@@ -135,8 +130,6 @@ tooling_images_task:
 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
@@ -155,12 +148,14 @@ base_images_task:
           name: "${PACKER_BUILDS} Base Image"
           env:
             PACKER_BUILDS: "fedora"
+          skip: $CI == $CI  # FIXME: Skip for aws testing
         - <<: *base_image
           env:
             PACKER_BUILDS: "prior-fedora"
         - <<: *base_image
           env:
             PACKER_BUILDS: "fedora-aws"
+          skip: $CI != $CI  # FIXME: exclusive aws testing
         - <<: *base_image
           env:
             PACKER_BUILDS: "ubuntu"
@@ -176,8 +171,6 @@ base_images_task:
 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
@@ -195,6 +188,7 @@ cache_images_task:
           name: "${PACKER_BUILDS} Cache Image"
           env:
             PACKER_BUILDS: "fedora"
+          skip: $CI == $CI  # FIXME: Skip for aws testing
         - <<: *cache_image
           env:
             PACKER_BUILDS: "prior-fedora"
@@ -207,6 +201,7 @@ cache_images_task:
         - <<: *cache_image
           env:
             PACKER_BUILDS: "fedora-aws"
+          skip: $CI != $CI  # FIXME: exclusive aws testing
         - <<: *cache_image
           env:
             PACKER_BUILDS: "build-push"
@@ -226,8 +221,7 @@ cache_images_task:
 imgts_task:
     name: "Apply new image metadata"
     alias: imgts
-    only_if: *is_pr
-    skip: *ci_docs_tooling
+    skip: $CI == $CI  # FIXME: Skip for aws testing
     depends_on:
         - cache_images
     container:
@@ -258,8 +252,7 @@ imgts_task:
 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  # FIXME: Skip for aws testing
     depends_on:
         - tooling_images
         - imgts
@@ -280,7 +273,7 @@ test_imgprune_task:
     <<: *lifecycle_test
     name: "Test obsolete image deletion"
     alias: test_imgprune
-    skip: *ci_docs
+    skip: $CI == $CI  # FIXME: Skip for aws testing
     depends_on:
         - tooling_images
         - imgts
@@ -291,8 +284,7 @@ test_imgprune_task:
 test_gcsupld_task:
     name: "Test uploading to GCS"
     alias: test_gcsupld
-    only_if: *not_cron
-    skip: *ci_docs
+    skip: $CI == $CI  # FIXME: Skip for aws testing
     depends_on:
         - tooling_images
         - imgts
@@ -310,8 +302,7 @@ test_gcsupld_task:
 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  # FIXME: Skip for aws testing
     depends_on:
         - tooling_images
         - imgts
@@ -327,8 +318,7 @@ test_get_ci_vm_task:
 test_build-push_task:
     name: "Test build-push VM functions"
     alias: test_build-push
-    only_if: *not_cron
-    skip: *ci_docs
+    skip: $CI == $CI  # FIXME: Skip for aws testing
     depends_on:
         - cache_images
     gce_instance: