From 19d707a515c1a7607ec783de22deee088b863efc Mon Sep 17 00:00:00 2001
From: Chris Evich <cevich@redhat.com>
Date: Wed, 15 Mar 2023 11:03:18 -0400
Subject: [PATCH 1/2] Cirrus: Update CI VM Images

Also update env. var. name for consistency with other repos.

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

diff --git a/.cirrus.yml b/.cirrus.yml
index df20622..aa0d713 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -11,8 +11,8 @@ env:
     GOCACHE: "${HOME}/.cache/go-build"
 
     # VM Image built in containers/automation_images
-    _BUILT_IMAGE_SUFFIX: "c6300530360713216"
-    FEDORA_CACHE_IMAGE_NAME: "fedora-${_BUILT_IMAGE_SUFFIX}"
+    IMAGE_SUFFIX: "c20230320t154110z-f37f36d12"
+    FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}"
 
     # Must be defined true when testing w/in containers
     CONTAINER: "false"

From bed5713b5a088f268a5e2bb5a691b5215263e8ae Mon Sep 17 00:00:00 2001
From: Chris Evich <cevich@redhat.com>
Date: Mon, 3 Apr 2023 10:35:31 -0400
Subject: [PATCH 2/2] Cirrus: Always collect journal after testing

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

diff --git a/.cirrus.yml b/.cirrus.yml
index aa0d713..d1d4505 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -100,6 +100,10 @@ build_and_test_task:
         - make test-unit
         - sudo make test-integration
 
+    # The hook runs in the background, errors will be in the journal.
+    always:
+        journal_script: journalctl -b
+
     binaries_artifacts:
         path: "bin/*"
         type: "application/octet-stream"