summaryrefslogtreecommitdiff
path: root/test/e2e
diff options
context:
space:
mode:
authorEd Santiago <santiago@redhat.com>2021-05-05 15:34:54 -0600
committerEd Santiago <santiago@redhat.com>2021-05-06 08:40:11 -0600
commit95a50a936ac58404ea9812b8ff2374b131b31a47 (patch)
tree9721a9505890ffb1adc6cc8ae36ee9e43ce99c00 /test/e2e
parent176ae99187de9068670dac1fb3ec30e11cd3dd93 (diff)
downloadpodman-95a50a936ac58404ea9812b8ff2374b131b31a47.tar.gz
podman-95a50a936ac58404ea9812b8ff2374b131b31a47.tar.bz2
podman-95a50a936ac58404ea9812b8ff2374b131b31a47.zip
CI: run rootless tests under ubuntu
Reason: to catch errors before they surface in RHEL. One of the Ubuntus is specially crafted to run with cgroups v1 and runc. Although this isn't quite the same as RHEL, it's as close as we can come in our CI environment, and I suspect it would have caught #10234 (a regression). Sorry, team. Also: play kube limits test: skip on all rootless, not just rootless+fedora. There was a complicated and unnecessary check in there for Fedora. Also: workaround for bug #10248, a spurious error message on the first invocation of rootless podman on Ubuntu.Old Signed-off-by: Ed Santiago <santiago@redhat.com>
Diffstat (limited to 'test/e2e')
-rw-r--r--test/e2e/common_test.go7
-rw-r--r--test/e2e/play_kube_test.go3
2 files changed, 1 insertions, 9 deletions
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go
index 8530d3dd3..359345096 100644
--- a/test/e2e/common_test.go
+++ b/test/e2e/common_test.go
@@ -605,13 +605,6 @@ func SkipIfRootlessCgroupsV1(reason string) {
}
}
-func SkipIfUnprivilegedCPULimits() {
- info := GetHostDistributionInfo()
- if isRootless() && info.Distribution == "fedora" {
- ginkgo.Skip("Rootless Fedora doesn't have permission to set CPU limits")
- }
-}
-
func SkipIfRootless(reason string) {
checkReason(reason)
if os.Geteuid() != 0 {
diff --git a/test/e2e/play_kube_test.go b/test/e2e/play_kube_test.go
index 836fbe1ee..dc3913394 100644
--- a/test/e2e/play_kube_test.go
+++ b/test/e2e/play_kube_test.go
@@ -1999,8 +1999,7 @@ VOLUME %s`, ALPINE, hostPathDir+"/")
It("podman play kube allows setting resource limits", func() {
SkipIfContainerized("Resource limits require a running systemd")
- SkipIfRootlessCgroupsV1("Limits require root or cgroups v2")
- SkipIfUnprivilegedCPULimits()
+ SkipIfRootless("CPU limits require root")
podmanTest.CgroupManager = "systemd"
var (