From 5fcd2a7ac3673bb4d455799c26c41f38a4d41b38 Mon Sep 17 00:00:00 2001
From: Chris Evich <cevich@redhat.com>
Date: Thu, 31 Mar 2022 14:26:36 -0400
Subject: Cirrus: Upd VM images to fix multi-arch build bug

Ref: https://github.com/containers/automation_images/pull/122

Signed-off-by: Chris Evich <cevich@redhat.com>
---
 .cirrus.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index beb871c23..700a1ad78 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -38,7 +38,7 @@ env:
     UBUNTU_NAME: "ubuntu-2110"
 
     # Google-cloud VM Images
-    IMAGE_SUFFIX: "c6261670816251904"
+    IMAGE_SUFFIX: "c6464310661611520"
     FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}"
     PRIOR_FEDORA_CACHE_IMAGE_NAME: "prior-fedora-${IMAGE_SUFFIX}"
     UBUNTU_CACHE_IMAGE_NAME: "ubuntu-${IMAGE_SUFFIX}"
-- 
cgit v1.2.3-54-g00ecf


From d55c46f8c69f907a539b518cce91bd5c0127ab89 Mon Sep 17 00:00:00 2001
From: Chris Evich <cevich@redhat.com>
Date: Thu, 31 Mar 2022 15:06:39 -0400
Subject: Cirrus: Allow manually running image-build task

Building multi-arch images in a standardized way is complex.  Some
of the builds themselves can take a really long time to run (over
an hour).  Make changes easier to test inside a PR by adding
manually-triggered image-build tasks.  These mirror most of the real
cron-triggered task, without actually pushing the final images.

Signed-off-by: Chris Evich <cevich@redhat.com>
---
 .cirrus.yml                        | 14 +++++++++++++-
 contrib/cirrus/cirrus_yaml_test.py |  3 ++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 700a1ad78..772843dd7 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -741,7 +741,7 @@ upgrade_test_task:
     always: *logs_artifacts
 
 
-image_build_task:
+image_build_task: &image-build
     name: "Build multi-arch $CTXDIR"
     alias: image_build
     # Some of these container images take > 1h to build, limit
@@ -774,6 +774,18 @@ image_build_task:
         - main.sh $CIRRUS_REPO_CLONE_URL $CTXDIR
 
 
+test_image_build_task:
+    <<: *image-build
+    # Allow this to run inside a PR
+    only_if: $CI == $CI
+    # This takes a LONG time, only run when requested.  N/B: Any task
+    # made to depend on this one will block FOREVER unless triggered.
+    trigger_type: manual
+    # Overwrite all 'env', don't push anything, just do the build.
+    env:
+        DRYRUN: 1
+
+
 # This task is critical.  It updates the "last-used by" timestamp stored
 # in metadata for all VM images.  This mechanism functions in tandem with
 # an out-of-band pruning operation to remove disused VM images.
diff --git a/contrib/cirrus/cirrus_yaml_test.py b/contrib/cirrus/cirrus_yaml_test.py
index b424c3ee6..a7fff8d3f 100755
--- a/contrib/cirrus/cirrus_yaml_test.py
+++ b/contrib/cirrus/cirrus_yaml_test.py
@@ -26,7 +26,8 @@ class TestCaseBase(unittest.TestCase):
 class TestDependsOn(TestCaseBase):
 
     ALL_TASK_NAMES = None
-    SUCCESS_DEPS_EXCLUDE = set(['success', 'artifacts', 'release', 'release_test'])
+    SUCCESS_DEPS_EXCLUDE = set(['success', 'artifacts',
+        'test_image_build', 'release', 'release_test'])
 
     def setUp(self):
         super().setUp()
-- 
cgit v1.2.3-54-g00ecf