From 4e40be1c9b22f80956fbff679f93e190ac5f35a7 Mon Sep 17 00:00:00 2001
From: Chris Evich <cevich@redhat.com>
Date: Tue, 29 Mar 2022 13:50:40 -0400
Subject: [PATCH] Cirrus: Update VM Images + env. var. name

For consistency with CI in other repositories, update the variable name.
Also, remove some variable definitions which are not included in the
common automation library.

Signed-off-by: Chris Evich <cevich@redhat.com>
---
 .cirrus.yml           | 10 +++++-----
 contrib/cirrus/lib.sh |  7 -------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 726acc3aef..28ad751a72 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -24,10 +24,10 @@ env:
     # GCE project where images live
     IMAGE_PROJECT: "libpod-218412"
     # VM Image built in containers/automation_images
-    _BUILT_IMAGE_SUFFIX: "c6431352024203264"
-    FEDORA_CACHE_IMAGE_NAME: "fedora-${_BUILT_IMAGE_SUFFIX}"
-    PRIOR_FEDORA_CACHE_IMAGE_NAME: "prior-fedora-${_BUILT_IMAGE_SUFFIX}"
-    UBUNTU_CACHE_IMAGE_NAME: "ubuntu-${_BUILT_IMAGE_SUFFIX}"
+    IMAGE_SUFFIX: "c4512539143831552"
+    FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}"
+    PRIOR_FEDORA_CACHE_IMAGE_NAME: "prior-fedora-${IMAGE_SUFFIX}"
+    UBUNTU_CACHE_IMAGE_NAME: "ubuntu-${IMAGE_SUFFIX}"
 
     ####
     #### Command variables to help avoid duplication
@@ -132,7 +132,7 @@ lint_task:
 meta_task:
 
     container:
-        image: "quay.io/libpod/imgts:${_BUILT_IMAGE_SUFFIX}"
+        image: "quay.io/libpod/imgts:${IMAGE_SUFFIX}"
         cpu: 1
         memory: 1
 
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh
index a7b1628597..6e6323e0d3 100755
--- a/contrib/cirrus/lib.sh
+++ b/contrib/cirrus/lib.sh
@@ -67,13 +67,6 @@ EPOCH_TEST_COMMIT="$CIRRUS_BASE_SHA"
 # Unsafe env. vars for display
 SECRET_ENV_RE='(IRCID)|(ACCOUNT)|(^GC[EP]..+)|(SSH)'
 
-# GCE image-name compatible string representation of distribution name
-OS_RELEASE_ID="$(source /etc/os-release; echo $ID)"
-# GCE image-name compatible string representation of distribution _major_ version
-OS_RELEASE_VER="$(source /etc/os-release; echo $VERSION_ID | tr -d '.')"
-# Combined to ease soe usage
-OS_REL_VER="${OS_RELEASE_ID}-${OS_RELEASE_VER}"
-
 # Working with dnf + timeout/retry
 SHORT_DNFY='lilto dnf -y'
 LONG_DNFY='bigto dnf -y'