diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-10-03 11:35:13 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-03 11:35:13 -0700 |
| commit | 3750b35ae2a22e7f7bc0070c5c2dadf1ef437074 (patch) | |
| tree | c5eee413a0cd57375f464084581704fc6bd22b00 /test/e2e/run_cgroup_parent_test.go | |
| parent | 2a3e3e7f25d9a7bbe5e6f3f35027ccbe6521961f (diff) | |
| parent | 14473270d7af520dae006605ab798ad9db34f184 (diff) | |
| download | podman-3750b35ae2a22e7f7bc0070c5c2dadf1ef437074.tar.gz podman-3750b35ae2a22e7f7bc0070c5c2dadf1ef437074.tar.bz2 podman-3750b35ae2a22e7f7bc0070c5c2dadf1ef437074.zip | |
Merge pull request #1578 from baude/addubuntuci
Add Ubuntu-18.04 to CI testing
Diffstat (limited to 'test/e2e/run_cgroup_parent_test.go')
| -rw-r--r-- | test/e2e/run_cgroup_parent_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/e2e/run_cgroup_parent_test.go b/test/e2e/run_cgroup_parent_test.go index 00b8d952d..f266fafa4 100644 --- a/test/e2e/run_cgroup_parent_test.go +++ b/test/e2e/run_cgroup_parent_test.go @@ -45,7 +45,7 @@ var _ = Describe("Podman run with --cgroup-parent", func() { Specify("no --cgroup-parent", func() { cgroup := "/libpod_parent" - if !containerized() { + if !containerized() && podmanTest.CgroupManager != "cgroupfs" { cgroup = "/machine.slice" } run := podmanTest.Podman([]string{"run", fedoraMinimal, "cat", "/proc/self/cgroup"}) @@ -56,7 +56,7 @@ var _ = Describe("Podman run with --cgroup-parent", func() { }) Specify("valid --cgroup-parent using slice", func() { - if containerized() { + if containerized() || podmanTest.CgroupManager == "cgroupfs" { Skip("Requires Systemd cgroup manager support") } cgroup := "aaaa.slice" |