diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-12-16 15:52:25 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-16 15:52:25 +0000 |
| commit | bacb2fc526dba7214e3c8420eccc5cf22bbb1a29 (patch) | |
| tree | 1e0e5dc8f71cacb030cd001734957c87b5370380 /test/e2e/containers_conf_test.go | |
| parent | 978c0767fa72abfa41f720f6fab34a62e3ac7a12 (diff) | |
| parent | f66ecc882df822260e41de24b1c5f44a1ba3c3ad (diff) | |
| download | podman-bacb2fc526dba7214e3c8420eccc5cf22bbb1a29.tar.gz podman-bacb2fc526dba7214e3c8420eccc5cf22bbb1a29.tar.bz2 podman-bacb2fc526dba7214e3c8420eccc5cf22bbb1a29.zip | |
Merge pull request #8312 from cevich/new_ubuntu_images
Cirrus: Update VM Images; Both Fedora and Ubuntu "prior" flavors run with CGroupsV1 & runc
Diffstat (limited to 'test/e2e/containers_conf_test.go')
| -rw-r--r-- | test/e2e/containers_conf_test.go | 2 |
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() |