summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Heon <mheon@redhat.com>2019-07-25 12:49:56 -0400
committerMatthew Heon <matthew.heon@pm.me>2019-07-25 14:57:58 -0400
commit0934949220443d741ff5ec15afb1180a7ecb1532 (patch)
treea888207cd0a37859805fa10faede8e359e1f0417
parent5763618ce550d148e4541d8ab61874ea85d39ab0 (diff)
downloadpodman-0934949220443d741ff5ec15afb1180a7ecb1532.tar.gz
podman-0934949220443d741ff5ec15afb1180a7ecb1532.tar.bz2
podman-0934949220443d741ff5ec15afb1180a7ecb1532.zip
Use systemd cgroups for Ubuntu
It seems like our VM images now support systemd CGroups with the Ubuntu LTS images. No reason to keep testing CGroupfs as such, systemd is much less racy (and CGroupfs on systemd-enabled systems can be iffy). Signed-off-by: Matthew Heon <mheon@redhat.com>
-rw-r--r--test/e2e/common_test.go5
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