summaryrefslogtreecommitdiff
path: root/test/e2e/containers_conf_test.go
diff options
context:
space:
mode:
authorChris Evich <cevich@redhat.com>2020-12-11 10:19:22 -0500
committerChris Evich <cevich@redhat.com>2020-12-15 18:49:10 -0500
commit427731ab9c977f1b89b49ff23d3adcffb6212f49 (patch)
tree8ce8f21d117307221872b45de77ef9a8ca4d4067 /test/e2e/containers_conf_test.go
parent0bb865e6c24942afec3757abd7ea6375be182190 (diff)
downloadpodman-427731ab9c977f1b89b49ff23d3adcffb6212f49.tar.gz
podman-427731ab9c977f1b89b49ff23d3adcffb6212f49.tar.bz2
podman-427731ab9c977f1b89b49ff23d3adcffb6212f49.zip
Disable incompatible rootless + CGroupsV1 tests
These tests simply will not work under these conditions. Note: Recently updated F32 (prior-fedora) and Ubuntu 20.04 (prior-ubuntu) VMs always use CGroupsV1 with runc. F33 and Ubuntu 20.10 were updated to always use CGroupsV2 with crun. Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to 'test/e2e/containers_conf_test.go')
-rw-r--r--test/e2e/containers_conf_test.go2
1 files changed, 2 insertions, 0 deletions
diff --git a/test/e2e/containers_conf_test.go b/test/e2e/containers_conf_test.go
index 28672cfc6..719ac9fac 100644
--- a/test/e2e/containers_conf_test.go
+++ b/test/e2e/containers_conf_test.go
@@ -82,6 +82,7 @@ var _ = Describe("Podman run", func() {
})
It("podman Capabilities in containers.conf", func() {
+ SkipIfRootlessCgroupsV1("Not supported for rootless + CGroupsV1")
cap := podmanTest.Podman([]string{"run", ALPINE, "grep", "CapEff", "/proc/self/status"})
cap.WaitWithDefaultTimeout()
Expect(cap.ExitCode()).To(Equal(0))
@@ -121,6 +122,7 @@ var _ = Describe("Podman run", func() {
})
verifyNSHandling := func(nspath, option string) {
+ SkipIfRootlessCgroupsV1("Not supported for rootless + CGroupsV1")
os.Setenv("CONTAINERS_CONF", "config/containers-ns.conf")
if IsRemote() {
podmanTest.RestartRemoteService()