From 0ac0e6e61254651c173992d3a855fb188c0ba288 Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Mon, 27 Jan 2020 12:02:59 -0500 Subject: Cirrus: F31: Force systemd cgroup mgr Signed-off-by: Chris Evich --- contrib/cirrus/setup_environment.sh | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'contrib/cirrus/setup_environment.sh') 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 -- cgit v1.2.3-54-g00ecf