diff options
| author | Chris Evich <cevich@redhat.com> | 2019-07-19 10:46:36 -0400 |
|---|---|---|
| committer | Chris Evich <cevich@redhat.com> | 2019-08-12 12:01:55 -0400 |
| commit | 7508179ed973a1ad0d26754d39180be8066c7df4 (patch) | |
| tree | 4ce6bf7c17899dba56868dac5d0c418353467455 /contrib/cirrus/setup_environment.sh | |
| parent | fd312ae30a8f23dd9fb26d2e72aa0b548b9f8453 (diff) | |
| download | podman-7508179ed973a1ad0d26754d39180be8066c7df4.tar.gz podman-7508179ed973a1ad0d26754d39180be8066c7df4.tar.bz2 podman-7508179ed973a1ad0d26754d39180be8066c7df4.zip | |
Cirrus: Add experimental fedora VM image & test
Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to 'contrib/cirrus/setup_environment.sh')
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index 5d350263e..7b6765f8a 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -62,9 +62,12 @@ install_test_configs make install.tools case "$SPECIALMODE" in - none) + cgroupv2) remove_packaged_podman_files # we're building from source ;; + none) + remove_packaged_podman_files + ;; rootless) # Only do this once, even if ROOTLESS_USER (somehow) changes if ! grep -q 'ROOTLESS_USER' /etc/environment @@ -85,5 +88,5 @@ case "$SPECIALMODE" in windows) ;& # for podman-remote building only darwin) ;; *) - die 111 "Unsupported \$SPECIAL_MODE: $SPECIALMODE" + die 111 "Unsupported \$SPECIALMODE: $SPECIALMODE" esac |