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>
This commit is contained in:
baude 2020-11-03 09:28:06 -06:00
parent 96358824f6
commit 73742a0e73
2 changed files with 4 additions and 6 deletions

View file

@ -613,12 +613,10 @@ func SkipIfRootlessCgroupsV1(reason string) {
} }
} }
func SkipIfUnprevilegedCPULimits() { func SkipIfUnprivilegedCPULimits() {
info := GetHostDistributionInfo() info := GetHostDistributionInfo()
if isRootless() && if isRootless() && info.Distribution == "fedora" {
info.Distribution == "fedora" && ginkgo.Skip("Rootless Fedora doesn't have permission to set CPU limits")
(info.Version == "31" || info.Version == "32") {
ginkgo.Skip("Rootless Fedora doesn't have permission to set CPU limits before version 33")
} }
} }

View file

@ -1406,7 +1406,7 @@ spec:
It("podman play kube allows setting resource limits", func() { It("podman play kube allows setting resource limits", func() {
SkipIfContainerized("Resource limits require a running systemd") SkipIfContainerized("Resource limits require a running systemd")
SkipIfRootlessCgroupsV1("Limits require root or cgroups v2") SkipIfRootlessCgroupsV1("Limits require root or cgroups v2")
SkipIfUnprevilegedCPULimits() SkipIfUnprivilegedCPULimits()
podmanTest.CgroupManager = "systemd" podmanTest.CgroupManager = "systemd"
var ( var (