diff options
| author | Matthew Heon <matthew.heon@gmail.com> | 2018-08-11 15:07:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-11 15:07:29 -0400 |
| commit | 7d116f5f73520e6db389f28e9963f0137a27d52d (patch) | |
| tree | 730fba1d59f4fe3877cffc6d65e4fce57fcb7fdd /test | |
| parent | 3ef9279cec43ca7e24fb00eb838d85e30b7e37f7 (diff) | |
| parent | a9b73abf8fcfdcbd9c767987ab5b24089332d004 (diff) | |
| download | podman-7d116f5f73520e6db389f28e9963f0137a27d52d.tar.gz podman-7d116f5f73520e6db389f28e9963f0137a27d52d.tar.bz2 podman-7d116f5f73520e6db389f28e9963f0137a27d52d.zip | |
Merge pull request #1254 from mheon/systemd_cgroups_default
Switch default CGroup manager to systemd
Diffstat (limited to 'test')
| -rw-r--r-- | test/e2e/libpod_suite_test.go | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/test/e2e/libpod_suite_test.go b/test/e2e/libpod_suite_test.go index 3b7953672..1b0c16e4a 100644 --- a/test/e2e/libpod_suite_test.go +++ b/test/e2e/libpod_suite_test.go @@ -29,6 +29,7 @@ var ( CNI_CONFIG_DIR string RUNC_BINARY string INTEGRATION_ROOT string + CGROUP_MANAGER = "systemd" STORAGE_OPTIONS = "--storage-driver vfs" ARTIFACT_DIR = "/tmp/.artifacts" CACHE_IMAGES = []string{ALPINE, BB, fedoraMinimal, nginx, redis, registry} @@ -60,6 +61,7 @@ type PodmanTest struct { SignaturePolicyPath string ArtifactPath string TempDir string + CgroupManager string } // HostOS is a simple struct for the test os @@ -141,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") != "" { + cgroupManager = os.Getenv("CGROUP_MANAGER") + } runCBinary := "/usr/bin/runc" CNIConfigDir := "/etc/cni/net.d" @@ -156,6 +162,7 @@ func PodmanCreate(tempDir string) PodmanTest { SignaturePolicyPath: filepath.Join(INTEGRATION_ROOT, "test/policy.json"), ArtifactPath: ARTIFACT_DIR, TempDir: tempDir, + CgroupManager: cgroupManager, } // Setup registries.conf ENV variable @@ -165,8 +172,8 @@ func PodmanCreate(tempDir string) PodmanTest { //MakeOptions assembles all the podman main options func (p *PodmanTest) MakeOptions() []string { - return strings.Split(fmt.Sprintf("--root %s --runroot %s --runtime %s --conmon %s --cni-config-dir %s", - p.CrioRoot, p.RunRoot, p.RunCBinary, p.ConmonBinary, p.CNIConfigDir), " ") + return strings.Split(fmt.Sprintf("--root %s --runroot %s --runtime %s --conmon %s --cni-config-dir %s --cgroup-manager %s", + p.CrioRoot, p.RunRoot, p.RunCBinary, p.ConmonBinary, p.CNIConfigDir, p.CgroupManager), " ") } // Podman is the exec call to podman on the filesystem, uid and gid the credentials to use |