diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-04-08 11:50:04 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-08 11:50:04 -0400 |
| commit | a81b078a588fa5f9b5b42b2ffc894d00f06980c3 (patch) | |
| tree | 040ab197f5e1557f9d298bb0e9d30f7b25f445a8 /contrib/cirrus/setup_environment.sh | |
| parent | 99e3111814225e4e0cb2c7dc882b7f2e450d70aa (diff) | |
| parent | ec88445fc83d666ec3f51e14acd1e5d3fd920863 (diff) | |
| download | podman-a81b078a588fa5f9b5b42b2ffc894d00f06980c3.tar.gz podman-a81b078a588fa5f9b5b42b2ffc894d00f06980c3.tar.bz2 podman-a81b078a588fa5f9b5b42b2ffc894d00f06980c3.zip | |
Merge pull request #9554 from cevich/new_f34b_images
Cirrus: Use Fedora 34beta images
Diffstat (limited to 'contrib/cirrus/setup_environment.sh')
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 11 |
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) ;& |