From d9d87f33d633a6f98e7877e720a18558e687599f Mon Sep 17 00:00:00 2001
From: Chris Evich <cevich@redhat.com>
Date: Tue, 23 Apr 2024 11:02:43 -0400
Subject: [PATCH 1/3] Bump automation library version

Importantly, this contains a necessary fix for `build_push.sh` needed to
stop immutable-image existence-check failing on build (c/image_build
cron job).

Signed-off-by: Chris Evich <cevich@redhat.com>
---
 IMG_SFX | 2 +-
 lib.sh  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/IMG_SFX b/IMG_SFX
index bb9541ab..e4035e6e 100644
--- a/IMG_SFX
+++ b/IMG_SFX
@@ -1 +1 @@
-20240411t124913z-f39f38d13
+20240424t143933z-f39f38d13
diff --git a/lib.sh b/lib.sh
index f998f6b6..3fd053d5 100644
--- a/lib.sh
+++ b/lib.sh
@@ -20,7 +20,7 @@ OS_REL_VER="$OS_RELEASE_ID-$OS_RELEASE_VER"
 PACKAGE_DOWNLOAD_DIR=/var/cache/download
 
 # N/B: This is managed by renovate
-INSTALL_AUTOMATION_VERSION="5.0.0"
+INSTALL_AUTOMATION_VERSION="5.0.1"
 
 # Mask secrets in show_env_vars() from automation library
 SECRET_ENV_RE='(^PATH$)|(^BASH_FUNC)|(^_.*)|(.*PASSWORD.*)|(.*TOKEN.*)|(.*SECRET.*)|(.*ACCOUNT.*)|(.+_JSON)|(AWS.+)|(.*SSH.*)|(.*GCP.*)'

From 82ac450b893857c0b9f5a052727795373c3f4773 Mon Sep 17 00:00:00 2001
From: Chris Evich <cevich@redhat.com>
Date: Tue, 23 Apr 2024 13:05:35 -0400
Subject: [PATCH 2/3] Simplify build-push test

Previously this task depended on executing a downstream test script
intended for exercising an orthagonal orchestration script (which
happens to call `build-push.sh`.  Having upstream CI VM image builds
depend on a downstream script is very much not ideal.  Replace this with
a very quick/dirty test that simply confirms a multi-arch build
can function.

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

diff --git a/.cirrus.yml b/.cirrus.yml
index cf8395b9..63f66361 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -474,9 +474,10 @@ test_build-push_task:
         # More muscle to emulate multi-arch
         type: "n2-standard-4"
     script: |
-      git clone --depth=1 https://github.com/containers/image_build.git ../ib
-      bash ../ib/build-push/.install.sh
-      bash ../ib/build-push/test.sh
+        mkdir /tmp/context
+        echo -e "FROM scratch\nENV foo=bar\n" > /tmp/context/Containerfile
+        source /etc/automation_environment
+        A_DEBUG=1 build-push.sh --nopush --arches=amd64,arm64,s390x,ppc64le example.com/foo/bar /tmp/context
 
 
 tag_latest_images_task:

From c3a0ca1aba3bc0c20cb1bbaf06cab8096aa433b9 Mon Sep 17 00:00:00 2001
From: Chris Evich <cevich@redhat.com>
Date: Wed, 24 Apr 2024 10:42:16 -0400
Subject: [PATCH 3/3] Bump container build timeout

Many/most of the container image builds rely on pulling packages from
repos that are sometimes slow/busy.  Give the tasks a bit of extra time
in case it's needed.

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

diff --git a/.cirrus.yml b/.cirrus.yml
index 63f66361..3c472c5b 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -71,7 +71,7 @@ container_images_task: &container_images
     skip: *ci_docs_tooling
     depends_on:
         - image_builder
-    timeout_in: 40m
+    timeout_in: &cntr_timeout 40m
     gce_instance: &ibi_vm
         image_project: "libpod-218412"
         # Trust whatever was built most recently is functional
@@ -117,7 +117,7 @@ imgts_build_task:
     skip: &ci_docs $CIRRUS_CHANGE_TITLE =~ '.*CI:DOCS.*'
     depends_on:
         - image_builder
-    timeout_in: 30m
+    timeout_in: *cntr_timeout
     gce_instance: *ibi_vm
     env: *image_env
     script: |
@@ -133,7 +133,7 @@ tooling_images_task:
     skip: *ci_docs
     depends_on:
         - imgts_build
-    timeout_in: 30m
+    timeout_in: *cntr_timeout
     gce_instance: *ibi_vm
     env: *image_env
     matrix: