diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-03-19 08:30:05 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-19 08:30:05 -0700 |
| commit | a1299f506d9b93824fae737f0f68a19adaf2bde1 (patch) | |
| tree | ff27a306055f4eb6a1b57455cd15d3c7fe6eccf9 /test/e2e/common_test.go | |
| parent | ac523cbe2b257e13c7b3b823c8de83e44052ffaf (diff) | |
| parent | 4ac08d3aa1882851d4a03aa1e53c47c6fb173958 (diff) | |
| download | podman-a1299f506d9b93824fae737f0f68a19adaf2bde1.tar.gz podman-a1299f506d9b93824fae737f0f68a19adaf2bde1.tar.bz2 podman-a1299f506d9b93824fae737f0f68a19adaf2bde1.zip | |
Merge pull request #2704 from giuseppe/fix-some-rootless
tests: fix rootless tests
Diffstat (limited to 'test/e2e/common_test.go')
| -rw-r--r-- | test/e2e/common_test.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go index afd6d3cf3..54b2cbec2 100644 --- a/test/e2e/common_test.go +++ b/test/e2e/common_test.go @@ -3,6 +3,7 @@ package integration import ( "encoding/json" "fmt" + "github.com/containers/libpod/pkg/rootless" "io/ioutil" "os" "os/exec" @@ -213,7 +214,11 @@ func PodmanTestCreateUtil(tempDir string, remote bool) *PodmanTestIntegration { if os.Getenv("STORAGE_OPTIONS") != "" { storageOptions = os.Getenv("STORAGE_OPTIONS") } + cgroupManager := CGROUP_MANAGER + if rootless.IsRootless() { + cgroupManager = "cgroupfs" + } if os.Getenv("CGROUP_MANAGER") != "" { cgroupManager = os.Getenv("CGROUP_MANAGER") } |