From 4b4fba0b4470d808d1cc48662eb6d09d31bc7955 Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Fri, 10 Aug 2018 13:57:54 -0400 Subject: Only use cgroupfs for containerized tests Signed-off-by: Matthew Heon --- test/e2e/libpod_suite_test.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'test') diff --git a/test/e2e/libpod_suite_test.go b/test/e2e/libpod_suite_test.go index 9f81c96df..7854f8a47 100644 --- a/test/e2e/libpod_suite_test.go +++ b/test/e2e/libpod_suite_test.go @@ -29,7 +29,7 @@ var ( CNI_CONFIG_DIR string RUNC_BINARY string INTEGRATION_ROOT string - CGROUP_MANAGER = "cgroupfs" + CGROUP_MANAGER = "systemd" STORAGE_OPTIONS = "--storage-driver vfs" ARTIFACT_DIR = "/tmp/.artifacts" CACHE_IMAGES = []string{ALPINE, BB, fedoraMinimal, nginx, redis, registry} @@ -143,6 +143,10 @@ func PodmanCreate(tempDir string) PodmanTest { if os.Getenv("STORAGE_OPTIONS") != "" { storageOptions = os.Getenv("STORAGE_OPTIONS") } + cgroupManager := CGROUP_MANAGER + if os.Getenv("CGROUP_MANAGER") != "" { + storageOptions = os.Getenv("CGROUP_MANAGER") + } runCBinary := "/usr/bin/runc" CNIConfigDir := "/etc/cni/net.d" -- cgit v1.2.3-54-g00ecf