diff options
| author | baude <bbaude@redhat.com> | 2018-10-01 12:10:46 -0500 |
|---|---|---|
| committer | baude <bbaude@redhat.com> | 2018-10-03 12:45:37 -0500 |
| commit | 14473270d7af520dae006605ab798ad9db34f184 (patch) | |
| tree | 3224b4b540df5adccc615f5adede8c3e3db7eb90 /test/e2e/run_cgroup_parent_test.go | |
| parent | 230edff5216d0a7cedeff06c891450f8691b5aa2 (diff) | |
| download | podman-14473270d7af520dae006605ab798ad9db34f184.tar.gz podman-14473270d7af520dae006605ab798ad9db34f184.tar.bz2 podman-14473270d7af520dae006605ab798ad9db34f184.zip | |
Add ability for ubuntu to be tested
unfortunately the papr CI system cannot test ubuntu as a VM; therefore,
this PR still keeps travis. but it does include fixes that will be required
for running on modern versions of ubuntu.
Signed-off-by: baude <bbaude@redhat.com>
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" |