opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-23 02:18:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8231 from baude/fedorarootlesscpulimit

Browse Source 
fedora rootless cpu settings
This commit is contained in:
OpenShift Merge Robot
2020-11-03 12:21:08 -05:00
committed by GitHub
parent 2a6e96e7ae 73742a0e73
commit 110c1c8b4b
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e/common_test.go
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")
} }
} }

2
test/e2e/play_kube_test.go
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 (