From 74379bc694197294f1aff647943d29fa3d92cedf Mon Sep 17 00:00:00 2001
From: Chris Evich <cevich@redhat.com>
Date: Thu, 7 Oct 2021 11:49:26 -0400
Subject: [PATCH] DO NOT COMMIT - TESTING UBUNTU

Signed-off-by: Chris Evich <cevich@redhat.com>
---
 .cirrus.yml | 35 +++++++++++------------------------
 1 file changed, 11 insertions(+), 24 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index dba912fc..60c47861 100644
--- a/.cirrus.yml
+++ b/.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
     timeout_in: 30m
@@ -134,7 +132,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
@@ -151,12 +148,6 @@ base_images_task:
     matrix:
         - &base_image
           name: "${PACKER_BUILDS} Base Image"
-          env:
-            PACKER_BUILDS: "fedora"
-        - <<: *base_image
-          env:
-            PACKER_BUILDS: "prior-fedora"
-        - <<: *base_image
           env:
             PACKER_BUILDS: "ubuntu"
     env:
@@ -171,7 +162,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
@@ -187,12 +177,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: "ubuntu"
     env:
@@ -208,7 +192,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:
@@ -237,7 +221,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
@@ -258,7 +242,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
@@ -270,7 +254,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
@@ -289,7 +273,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
@@ -307,6 +291,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
@@ -321,6 +306,7 @@ cron_imgprune_task:
     <<: *lifecycle_cron
     name: "Periodicly delete obsolete images"
     alias: cron_imgprune
+    skip: $CI == $CI
     depends_on:
         - cron_imgobsolete
     container:
@@ -330,6 +316,7 @@ cron_imgprune_task:
 success_task:
     name: &success_name success
     alias: *success_name
+    skip: $CI == $CI
     depends_on:
         - validate
         - image_builder