opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-27 13:38:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Temporarily force all tests to use cgroupfs driver

Browse Source 
TODO: Change this to only force cgroupfs if if we are in a
container.

Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
This commit is contained in:
Matthew Heon
2018-08-10 13:52:47 -04:00
parent 589a5d2d3e
commit 8dad23857c
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test/e2e/libpod_suite_test.go
View File

@ -29,6 +29,7 @@ var (
CNI_CONFIG_DIR string CNI_CONFIG_DIR string
RUNC_BINARY string RUNC_BINARY string
INTEGRATION_ROOT string INTEGRATION_ROOT string
CGROUP_MANAGER = "cgroupfs"
STORAGE_OPTIONS = "--storage-driver vfs" STORAGE_OPTIONS = "--storage-driver vfs"
ARTIFACT_DIR = "/tmp/.artifacts" ARTIFACT_DIR = "/tmp/.artifacts"
CACHE_IMAGES = []string{ALPINE, BB, fedoraMinimal, nginx, redis, registry} CACHE_IMAGES = []string{ALPINE, BB, fedoraMinimal, nginx, redis, registry}
@ -60,6 +61,7 @@ type PodmanTest struct {
SignaturePolicyPath string SignaturePolicyPath string
ArtifactPath string ArtifactPath string
TempDir string TempDir string
CgroupManager string
} }
// HostOS is a simple struct for the test os // 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"), SignaturePolicyPath: filepath.Join(INTEGRATION_ROOT, "test/policy.json"),
ArtifactPath: ARTIFACT_DIR, ArtifactPath: ARTIFACT_DIR,
TempDir: tempDir, TempDir: tempDir,
CgroupManager: CGROUP_MANAGER,
} }
// Setup registries.conf ENV variable // Setup registries.conf ENV variable
@ -165,8 +168,8 @@ func PodmanCreate(tempDir string) PodmanTest {
//MakeOptions assembles all the podman main options //MakeOptions assembles all the podman main options
func (p *PodmanTest) MakeOptions() []string { func (p *PodmanTest) MakeOptions() []string {
return strings.Split(fmt.Sprintf("--root %s --runroot %s --runtime %s --conmon %s --cni-config-dir %s", 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.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 // Podman is the exec call to podman on the filesystem, uid and gid the credentials to use