summaryrefslogtreecommitdiff
path: root/contrib/cirrus/setup_environment.sh
diff options
context:
space:
mode:
authorChris Evich <cevich@redhat.com>2021-03-01 10:18:59 -0500
committerChris Evich <cevich@redhat.com>2021-04-07 15:20:06 -0400
commitec88445fc83d666ec3f51e14acd1e5d3fd920863 (patch)
tree038775c00a798c723abc9bccdf61b92f0b6a5e12 /contrib/cirrus/setup_environment.sh
parentf28e9da45ce2cc75db86a71888957cb57e3bbefa (diff)
downloadpodman-ec88445fc83d666ec3f51e14acd1e5d3fd920863.tar.gz
podman-ec88445fc83d666ec3f51e14acd1e5d3fd920863.tar.bz2
podman-ec88445fc83d666ec3f51e14acd1e5d3fd920863.zip
Cirrus: Use Fedora 34beta images
Also, revert 4875a8fb Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to 'contrib/cirrus/setup_environment.sh')
-rwxr-xr-xcontrib/cirrus/setup_environment.sh11
1 files changed, 4 insertions, 7 deletions
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) ;&