Cirrus: Use updated VM images

Mainly this is to confirm some changes needed for the podman-py CI setup
don't disrupt operations here. Ref:

containers/automation_images#111

Also includes a minor steup fix WRT setting up for test-rpm build.

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

.cirrus.yml

@@ -38,7 +38,7 @@ env:
     UBUNTU_NAME: "ubuntu-2110"
 
     # Google-cloud VM Images
-    IMAGE_SUFFIX: "c6454758209748992"
+    IMAGE_SUFFIX: "c5814666029957120"
     FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}"
     PRIOR_FEDORA_CACHE_IMAGE_NAME: "prior-fedora-${IMAGE_SUFFIX}"
     UBUNTU_CACHE_IMAGE_NAME: "ubuntu-${IMAGE_SUFFIX}"

contrib/cirrus/setup_environment.sh

@@ -247,6 +247,7 @@ esac
 case "$TEST_FLAVOR" in
     ext_svc) ;;
     validate)
+        dnf install -y $PACKAGE_DOWNLOAD_DIR/python3*.rpm
         # For some reason, this is also needed for validation
         make .install.pre-commit
         ;;
@@ -257,7 +258,7 @@ case "$TEST_FLAVOR" in
         if [[ "$ALT_NAME" =~ RPM ]]; then
             bigto dnf install -y glibc-minimal-langpack go-rpm-macros rpkg rpm-build shadow-utils-subid-devel
         fi
-        ;&
+        ;;
     docker-py)
         remove_packaged_podman_files
         make install PREFIX=/usr ETCDIR=/etc