github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-08-13 20:25:38 +00:00
Code Issues Projects Releases Wiki Activity

Update on #834: force runc only when cgroupsv1

Browse Source 
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 <santiago@redhat.com>
This commit is contained in:
Ed Santiago 2020-03-30 15:09:14 -06:00
parent 6db5626c3b
commit 6e3f4c99be
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
systemtest/helpers.bash
View File

@ -291,9 +291,21 @@ start_registry() {
reg_args+=( -e REGISTRY_STORAGE_DELETE_ENABLED=true) reg_args+=( -e REGISTRY_STORAGE_DELETE_ENABLED=true)
fi 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), # cgroup option necessary under podman-in-podman (CI tests),
# and doesn't seem to do any harm otherwise. # 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 # Called with --testuser? Create an htpasswd file
if [[ -n $testuser ]]; then if [[ -n $testuser ]]; then