diff options
| author | baude <bbaude@redhat.com> | 2020-11-03 09:28:06 -0600 |
|---|---|---|
| committer | baude <bbaude@redhat.com> | 2020-11-03 09:28:06 -0600 |
| commit | 73742a0e73ddaf00e8a44d80c6ae0e1af3254e26 (patch) | |
| tree | c226d08a33336e08414d12f6d92a749672df2cc0 /test/e2e | |
| parent | 96358824f6eb9a8a4c42abea5d5422fe42ecb106 (diff) | |
| download | podman-73742a0e73ddaf00e8a44d80c6ae0e1af3254e26.tar.gz podman-73742a0e73ddaf00e8a44d80c6ae0e1af3254e26.tar.bz2 podman-73742a0e73ddaf00e8a44d80c6ae0e1af3254e26.zip | |
fedora rootless cpu settings
fedora does not have the the ability in rootless to set cpu limits.
this requires a simple fix for fedora 33 to pass ci tests.
Signed-off-by: baude <bbaude@redhat.com>
Diffstat (limited to 'test/e2e')
| -rw-r--r-- | test/e2e/common_test.go | 8 | ||||
| -rw-r--r-- | test/e2e/play_kube_test.go | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go index 3814d161d..678b2c882 100644 --- a/test/e2e/common_test.go +++ b/test/e2e/common_test.go @@ -613,12 +613,10 @@ func SkipIfRootlessCgroupsV1(reason string) { } } -func SkipIfUnprevilegedCPULimits() { +func SkipIfUnprivilegedCPULimits() { info := GetHostDistributionInfo() - if isRootless() && - info.Distribution == "fedora" && - (info.Version == "31" || info.Version == "32") { - ginkgo.Skip("Rootless Fedora doesn't have permission to set CPU limits before version 33") + if isRootless() && info.Distribution == "fedora" { + ginkgo.Skip("Rootless Fedora doesn't have permission to set CPU limits") } } diff --git a/test/e2e/play_kube_test.go b/test/e2e/play_kube_test.go index 6dcfa9bd8..1d683e987 100644 --- a/test/e2e/play_kube_test.go +++ b/test/e2e/play_kube_test.go @@ -1406,7 +1406,7 @@ spec: It("podman play kube allows setting resource limits", func() { SkipIfContainerized("Resource limits require a running systemd") SkipIfRootlessCgroupsV1("Limits require root or cgroups v2") - SkipIfUnprevilegedCPULimits() + SkipIfUnprivilegedCPULimits() podmanTest.CgroupManager = "systemd" var ( |