From 146809b41a9543235aaa14c2a7475c85934a1016 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Thu, 16 Feb 2023 09:19:23 -0700 Subject: [PATCH] RHEL8 gating-test skips and tweaks ...to deal with runc, cgroups v1, whatever is causing these failures on RHEL8. Signed-off-by: Ed Santiago --- test/system/252-quadlet.bats | 1 + test/system/700-play.bats | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/test/system/252-quadlet.bats b/test/system/252-quadlet.bats index 017070d363..5d4ca2b426 100644 --- 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 index 9c8867a29d..c3655ced65 100644 --- 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"