diff options
| author | baude <bbaude@redhat.com> | 2019-03-14 12:03:42 -0500 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-03-19 15:01:48 +0100 |
| commit | c6b205be77fb2a50772cd31267e09503ecd8b6bc (patch) | |
| tree | 1e263d436ede974588e3b39af21955806cf19016 /test/e2e/common_test.go | |
| parent | ac523cbe2b257e13c7b3b823c8de83e44052ffaf (diff) | |
| download | podman-c6b205be77fb2a50772cd31267e09503ecd8b6bc.tar.gz podman-c6b205be77fb2a50772cd31267e09503ecd8b6bc.tar.bz2 podman-c6b205be77fb2a50772cd31267e09503ecd8b6bc.zip | |
Enable rootless integration tests
Signed-off-by: baude <bbaude@redhat.com>
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") } |