diff options
| author | Matthew Heon <matthew.heon@gmail.com> | 2018-08-10 13:52:47 -0400 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@gmail.com> | 2018-08-10 13:52:47 -0400 |
| commit | 8dad23857c26dd1d5a1c04e1cf299e95e69e8baf (patch) | |
| tree | ada1aa45207b3c3442fa90ac99e37f7d39ced87d /test/e2e | |
| parent | 589a5d2d3e6c6a75942c146013b2938ad3492d43 (diff) | |
| download | podman-8dad23857c26dd1d5a1c04e1cf299e95e69e8baf.tar.gz podman-8dad23857c26dd1d5a1c04e1cf299e95e69e8baf.tar.bz2 podman-8dad23857c26dd1d5a1c04e1cf299e95e69e8baf.zip | |
Temporarily force all tests to use cgroupfs driver
TODO: Change this to only force cgroupfs if if we are in a
container.
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
Diffstat (limited to 'test/e2e')
| -rw-r--r-- | test/e2e/libpod_suite_test.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/test/e2e/libpod_suite_test.go b/test/e2e/libpod_suite_test.go index 3b7953672..9f81c96df 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 = "cgroupfs" 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 @@ -156,6 +158,7 @@ func PodmanCreate(tempDir string) PodmanTest { SignaturePolicyPath: filepath.Join(INTEGRATION_ROOT, "test/policy.json"), ArtifactPath: ARTIFACT_DIR, TempDir: tempDir, + CgroupManager: CGROUP_MANAGER, } // Setup registries.conf ENV variable @@ -165,8 +168,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 |