diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-07-26 10:41:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-26 10:41:04 +0200 |
| commit | 1910d68e4d574ebf53aa31e2dc7e56b0839a65f5 (patch) | |
| tree | 8b541f70883b2ec7bcd9305a0ab28d37baff1a46 | |
| parent | 4674d00f46380f38532ebf32cd632579b47773bb (diff) | |
| parent | 0934949220443d741ff5ec15afb1180a7ecb1532 (diff) | |
| download | podman-1910d68e4d574ebf53aa31e2dc7e56b0839a65f5.tar.gz podman-1910d68e4d574ebf53aa31e2dc7e56b0839a65f5.tar.bz2 podman-1910d68e4d574ebf53aa31e2dc7e56b0839a65f5.zip | |
Merge pull request #3645 from mheon/systemd_ubuntu
Use systemd cgroups for Ubuntu
| -rw-r--r-- | test/e2e/common_test.go | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go index ef1c85518..7e14f9e06 100644 --- a/test/e2e/common_test.go +++ b/test/e2e/common_test.go @@ -214,11 +214,6 @@ func PodmanTestCreateUtil(tempDir string, remote bool) *PodmanTestIntegration { cgroupManager = os.Getenv("CGROUP_MANAGER") } - // Ubuntu doesn't use systemd cgroups - if host.Distribution == "ubuntu" { - cgroupManager = "cgroupfs" - } - ociRuntime := os.Getenv("OCI_RUNTIME") if ociRuntime == "" { var err error |