diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-08-12 21:28:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-12 21:28:56 +0200 |
| commit | f634fd39001ad3dc62b83e5d78c6912db915a1e9 (patch) | |
| tree | b7f5ad11be24f0d63cc8dd76a978781014a5e788 /contrib/cirrus/setup_environment.sh | |
| parent | 3cf4567e1dfcf172673694a1171ae18bcbf9c846 (diff) | |
| parent | b843804d51ec3fb747670201b6178896d9a4580d (diff) | |
| download | podman-f634fd39001ad3dc62b83e5d78c6912db915a1e9.tar.gz podman-f634fd39001ad3dc62b83e5d78c6912db915a1e9.tar.bz2 podman-f634fd39001ad3dc62b83e5d78c6912db915a1e9.zip | |
Merge pull request #3607 from cevich/cgroup2_vm
Add another Fedora VM with cgroups v2 enabled
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 ab7279b11..03acaf1da 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -67,9 +67,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 @@ -90,5 +93,5 @@ case "$SPECIALMODE" in windows) ;& # for podman-remote building only darwin) ;; *) - die 111 "Unsupported \$SPECIAL_MODE: $SPECIALMODE" + die 111 "Unsupported \$SPECIALMODE: $SPECIALMODE" esac |