From 6e3f4c99be32d011f496508b2761ee436c3170c8 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Mon, 30 Mar 2020 15:09:14 -0600 Subject: [PATCH] Update on #834: force runc only when cgroupsv1 PR 834 broke Fedora gating tests, because "--runtime runc" doesn't work so well on Rawhide. Let's try to be smarter about when we add that override. Signed-off-by: Ed Santiago --- systemtest/helpers.bash | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/systemtest/helpers.bash b/systemtest/helpers.bash index 306ace53..ee217e1c 100644 --- a/systemtest/helpers.bash +++ b/systemtest/helpers.bash @@ -291,9 +291,21 @@ start_registry() { reg_args+=( -e REGISTRY_STORAGE_DELETE_ENABLED=true) fi + # TODO: This is TEMPORARY (as of 2020-03-30); remove once crun is fixed. + # Skopeo PR #836 claims there's a "regression" in crun with cgroupsv1, + # but offers no details about what it is (crun issue nor PR) nor when/if + # it's fixed. It's simply a workaround, forcing podman to use runc, + # which might work great for skopeo CI but breaks Fedora gating tests. + # Instead of always forcing runc, do so only when under cgroups v1: + local runtime= + cgroup_type=$(stat -f -c %T /sys/fs/cgroup) + if [[ $cgroup_type == "tmpfs" ]]; then + runtime="--runtime runc" + fi + # cgroup option necessary under podman-in-podman (CI tests), # and doesn't seem to do any harm otherwise. - PODMAN="podman --runtime runc --cgroup-manager=cgroupfs" + PODMAN="podman $runtime --cgroup-manager=cgroupfs" # Called with --testuser? Create an htpasswd file if [[ -n $testuser ]]; then