opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-19 04:03:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Enable rootless integration tests

Browse Source 
Signed-off-by: baude <bbaude@redhat.com>
This commit is contained in:
baude
2019-03-14 12:03:42 -05:00
committed by Giuseppe Scrivano
parent ac523cbe2b
commit c6b205be77
38 changed files with 119 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/e2e/common_test.go
View File

@ -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")
}