Merge pull request containers#17531 from edsantiago/rhel8_test_skips

RHEL8 gating-test skips and tweaks
vrothberg · Feb 20, 2023 · e1703bb · e1703bb
2 parents d865e23 + 146809b
commit e1703bb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/test/system/252-quadlet.bats b/test/system/252-quadlet.bats
@@ -15,6 +15,7 @@ function start_time() {
 
 function setup() {
     skip_if_remote "quadlet tests are meaningless over remote"
+    skip_if_rootless_cgroupsv1 "quadlet tests don't work rootless on RHEL8"
 
     start_time
 

diff --git a/test/system/700-play.bats b/test/system/700-play.bats
@@ -241,7 +241,8 @@ EOF
     mkdir -p $TESTDIR
     echo "$testYaml" | sed "s|TESTDIR|${TESTDIR}|g" > $PODMAN_TMPDIR/test.yaml
     run_podman kube play --network host $PODMAN_TMPDIR/test.yaml
-    is "$output" "Pod:.*" "podman kube play should work with --network host"
+    # leading ".*" handles "resource limit blah" warning with runc
+    is "$output" ".*Pod:.*" "podman kube play should work with --network host"
 
     run_podman pod inspect --format "{{.InfraConfig.HostNetwork}}" test_pod
     is "$output" "true" ".InfraConfig.HostNetwork"