summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@gmail.com>2018-08-10 13:57:54 -0400
committerMatthew Heon <matthew.heon@gmail.com>2018-08-10 13:57:54 -0400
commit4b4fba0b4470d808d1cc48662eb6d09d31bc7955 (patch)
treebd2445d61fef2008b20698b9bc8798c0ee85be1c /test
parent8dad23857c26dd1d5a1c04e1cf299e95e69e8baf (diff)
downloadpodman-4b4fba0b4470d808d1cc48662eb6d09d31bc7955.tar.gz
podman-4b4fba0b4470d808d1cc48662eb6d09d31bc7955.tar.bz2
podman-4b4fba0b4470d808d1cc48662eb6d09d31bc7955.zip
Only use cgroupfs for containerized tests
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
Diffstat (limited to 'test')
-rw-r--r--test/e2e/libpod_suite_test.go6
1 files changed, 5 insertions, 1 deletions
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"