From 0934949220443d741ff5ec15afb1180a7ecb1532 Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Thu, 25 Jul 2019 12:49:56 -0400 Subject: 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 --- test/e2e/common_test.go | 5 ----- 1 file changed, 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 -- cgit v1.2.3-54-g00ecf