From a1be9a4c0d85cf56bfe5b4e95409e646f4c5311b Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Mon, 8 Apr 2024 10:06:32 -0600 Subject: [PATCH] RHEL gating tests: skip some tests under runc Manual cherrypick of (portions of) #14972, for tests that don't work under runc. Signed-off-by: Ed Santiago --- test/system/200-pod.bats | 5 ++--- test/system/251-system-service.bats | 4 ++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/test/system/200-pod.bats b/test/system/200-pod.bats index 8d884f6af7..d4148bcce4 100644 --- a/test/system/200-pod.bats +++ b/test/system/200-pod.bats @@ -474,9 +474,8 @@ spec: @test "pod resource limits" { skip_if_remote "resource limits only implemented on non-remote" - if is_rootless; then - skip "only meaningful for rootful" - fi + skip_if_rootless "resource limits only work with root" + skip_if_cgroupsv1 "resource limits only meaningful on cgroups V2" local name1="resources1" run_podman --cgroup-manager=systemd pod create --name=$name1 --cpus=5 --memory=10m diff --git a/test/system/251-system-service.bats b/test/system/251-system-service.bats index edee4a28c4..197d1cb18e 100644 --- a/test/system/251-system-service.bats +++ b/test/system/251-system-service.bats @@ -17,6 +17,10 @@ function teardown() { @test "podman-system-service containers survive service stop" { skip_if_remote "podman system service unavailable over remote" + local runtime=$(podman_runtime) + if [[ "$runtime" != "crun" ]]; then + skip "survival code only implemented in crun; you're using $runtime" + fi port=$(random_free_port) URL=tcp://127.0.0.1:$port