diff options
author | Chris Evich <cevich@redhat.com> | 2020-01-27 12:02:59 -0500 |
---|---|---|
committer | Chris Evich <cevich@redhat.com> | 2020-02-25 12:34:25 -0500 |
commit | 0ac0e6e61254651c173992d3a855fb188c0ba288 (patch) | |
tree | db645bd8e34108c308249de34c801d2d326ea489 /contrib/cirrus | |
parent | eae42ab2560fbf1d53d59e36f575b208259f260e (diff) | |
download | podman-0ac0e6e61254651c173992d3a855fb188c0ba288.tar.gz podman-0ac0e6e61254651c173992d3a855fb188c0ba288.tar.bz2 podman-0ac0e6e61254651c173992d3a855fb188c0ba288.zip |
Cirrus: F31: Force systemd cgroup mgr
Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to 'contrib/cirrus')
-rwxr-xr-x | contrib/cirrus/setup_environment.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index de3a806d1..54abb0b1b 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -53,9 +53,15 @@ case "${OS_RELEASE_ID}" in warn "aka https://bugzilla.kernel.org/show_bug.cgi?id=205447" echo "mq-deadline" > /sys/block/sda/queue/scheduler cat /sys/block/sda/queue/scheduler + + warn "Forcing systemd cgroup manager" + X=$(echo "export CGROUP_MANAGER=systemd" | \ + tee -a /etc/environment) && eval "$X" && echo "$X" + warn "Testing with crun instead of runc" X=$(echo "export OCI_RUNTIME=/usr/bin/crun" | \ tee -a /etc/environment) && eval "$X" && echo "$X" + warn "Upgrading to the latest crun" # Normally not something to do for stable testing # but crun is new, and late-breaking fixes may be required |