diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-11-03 12:21:08 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-03 12:21:08 -0500 |
| commit | 110c1c8b4b74ee5e2a551402d94a9c31c1e06327 (patch) | |
| tree | fde2161d64bdf758a8e2c6c4b6eaff5be393b7a2 | |
| parent | 2a6e96e7ae1ecc00aa94b52194b7ec285be28989 (diff) | |
| parent | 73742a0e73ddaf00e8a44d80c6ae0e1af3254e26 (diff) | |
| download | podman-110c1c8b4b74ee5e2a551402d94a9c31c1e06327.tar.gz podman-110c1c8b4b74ee5e2a551402d94a9c31c1e06327.tar.bz2 podman-110c1c8b4b74ee5e2a551402d94a9c31c1e06327.zip | |
Merge pull request #8231 from baude/fedorarootlesscpulimit
fedora rootless cpu settings
| -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 ( |