summaryrefslogtreecommitdiff
path: root/contrib/cirrus
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-12-09 17:28:18 -0500
committerGitHub <noreply@github.com>2020-12-09 17:28:18 -0500
commit9216be2008696bc9f0bc26686be8becae3d12bfc (patch)
tree74d9b11db36e06a3b28106c2d9e01b615cf1f568 /contrib/cirrus
parenteb053df7843d9ec4aba4ee331e04b1d1d5a4ceee (diff)
parentc20bd3558904d3ccb937364813a199ba81a5df6a (diff)
downloadpodman-9216be2008696bc9f0bc26686be8becae3d12bfc.tar.gz
podman-9216be2008696bc9f0bc26686be8becae3d12bfc.tar.bz2
podman-9216be2008696bc9f0bc26686be8becae3d12bfc.zip
Merge pull request #8636 from containers/dependabot/go_modules/github.com/containers/storage-1.24.3
Bump github.com/containers/storage from 1.24.1 to 1.24.3
Diffstat (limited to 'contrib/cirrus')
-rwxr-xr-xcontrib/cirrus/setup_environment.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh
index da175cc05..c32b45a4f 100755
--- a/contrib/cirrus/setup_environment.sh
+++ b/contrib/cirrus/setup_environment.sh
@@ -47,6 +47,11 @@ 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" ]] || \