Cirrus: Update to F34beta VM image

Also update a few minor items related to use of newer automation library

Signed-off-by: Chris Evich <cevich@redhat.com>

.cirrus.yml

@@ -21,7 +21,7 @@ env:
     # GCE project where images live
     IMAGE_PROJECT: "libpod-218412"
     # VM Image built in containers/automation_images
-    _BUILT_IMAGE_SUFFIX: "c6233039174893568"
+    _BUILT_IMAGE_SUFFIX: "c5032481331085312"
     FEDORA_CACHE_IMAGE_NAME: "fedora-${_BUILT_IMAGE_SUFFIX}"
     PRIOR_FEDORA_CACHE_IMAGE_NAME: "prior-fedora-${_BUILT_IMAGE_SUFFIX}"
 

contrib/cirrus/lib.sh

@@ -13,8 +13,12 @@ set -a
 _waserrexit=0
 if [[ "$SHELLOPTS" =~ errexit ]]; then _waserrexit=1; fi
 set +e  # Assumed in F33 for setting global vars
-source /etc/profile
-source /etc/environment
+if [[ -r "/etc/automation_environment" ]]; then
+    source /etc/automation_environment
+else # prior to automation library v2.0, this was necessary
+    source /etc/profile
+    source /etc/environment
+fi
 if [[ -r "/etc/ci_environment" ]]; then source /etc/ci_environment; fi
 USER="$(whoami)"
 HOME="$(getent passwd $USER | cut -d : -f 6)"
@@ -73,13 +77,6 @@ SECRET_ENV_RE='(IRCID)|(ACCOUNT)|(^GC[EP]..+)|(SSH)'
 # END Global export of all variables
 set +a
 
-# It's like 'set -x' but only for one command at a time
-showrun() {
-    echo '--------------------------------------------------'
-    echo '+ '$(printf " %q" "$@") > /dev/stderr
-    "$@"
-}
-
 # Remove all files (except conmon, and the cni-config) provided by the distro version.
 remove_packaged_podman_files() {
     echo "Removing packaged podman files to prevent conflicts with source build and testing."

contrib/cirrus/setup.sh

@@ -4,6 +4,8 @@ set -eo pipefail
 
 source "$(dirname $0)/lib.sh"
 
+show_env_vars
+
 case "${OS_RELEASE_ID}" in
     fedora)
         echo "Installing necessary additional packages"