Merge pull request #9554 from cevich/new_f34b_images

Cirrus: Use Fedora 34beta images

2 files changed, 5 insertions, 7 deletions

diff --git a/contrib/cirrus/pr-should-include-tests b/contrib/cirrus/pr-should-include-tests
index e3c5d5da1..2bc06df50 100755
--- a/contrib/cirrus/pr-should-include-tests
+++ b/contrib/cirrus/pr-should-include-tests
@@ -32,6 +32,7 @@ fi
 # This is OK if the only files being touched are "safe" ones.
 filtered_changes=$(git diff --name-status $base $head |
                        awk '{print $2}'               |
+                       fgrep -vx Makefile             |
                        fgrep -vx .cirrus.yml          |
                        fgrep -vx changelog.txt        |
                        fgrep -vx go.mod               |
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh
index 36878365d..86b8d78ef 100755
--- a/contrib/cirrus/setup_environment.sh
+++ b/contrib/cirrus/setup_environment.sh
@@ -50,14 +50,9 @@ echo -e "\n# Begin single-use VM global variables (${BASH_SOURCE[0]})" \
     done <<<"$(passthrough_envars)"
 ) >> "/etc/ci_environment"
 
-#####
-##### FIXME. /etc/containers/storage.conf should have a driver name set
-##### Remove when VMs updated
-sed 's/^driver.*=.*""/driver = "overlay"/g' -i /etc/containers/storage.conf
-
 # This is a possible manual maintenance gaff, check to be sure everything matches.
 # shellcheck disable=SC2154
-[[ "$DISTRO_NV" == "$OS_REL_VER" ]] || \
+[[ "$DISTRO_NV" =~ $OS_REL_VER ]] || \
     die "Automation spec. '$DISTRO_NV'; actual host '$OS_REL_VER'"
 
 # Only allow this script to execute once
@@ -200,7 +195,9 @@ case "$TEST_FLAVOR" in
     build) make clean ;;
     unit) ;;
     apiv2) ;&  # use next item
-    compose) ;&
+    compose)
+        dnf install -y $PACKAGE_DOWNLOAD_DIR/podman-docker*
+        ;&  # continue with next item
     int) ;&
     sys) ;&
     upgrade_test) ;&