From f869817d9c4c3dd7b52ffed5ef4ad45ea0375cf9 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Tue, 5 Jul 2022 13:27:24 -0600 Subject: [PATCH] Force CgroupsV1 on Ubuntu PR #115 removed a force-cgroups-v2 setup for Ubuntu, possibly assuming that Ubuntu uses cgroups v1 by default? That doesn't seem to be the case: the Ubuntu I've looked at (via Cirrus rerun-with-terminal) seems to default to v2. End result is that we've been running CI for months without testing runc. This PR forces cgroups v1 on Ubuntu, via grub boot args. Also, remove a confusing "--exclude netavark et al". Again in PR #115 the "TODO: remove this" comment was removed but the actual code was not. I believe that was an oversight. Both of these are completely untested. This PR is the test. Signed-off-by: Ed Santiago --- cache_images/fedora-netavark_packaging.sh | 4 +--- cache_images/ubuntu_setup.sh | 3 ++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cache_images/fedora-netavark_packaging.sh b/cache_images/fedora-netavark_packaging.sh index 2d310189..3cd88f6a 100644 --- a/cache_images/fedora-netavark_packaging.sh +++ b/cache_images/fedora-netavark_packaging.sh @@ -61,10 +61,8 @@ INSTALL_PACKAGES=(\ zip ) -EXARG="--exclude=netavark --exclude=aardvark-dns --exclude=cargo --exclude=rust" - msg "Installing general build/test dependencies" -bigto $SUDO dnf install -y $EXARG "${INSTALL_PACKAGES[@]}" +bigto $SUDO dnf install -y "${INSTALL_PACKAGES[@]}" # It was observed in F33, dnf install doesn't always get you the latest/greatest lilto $SUDO dnf update -y diff --git a/cache_images/ubuntu_setup.sh b/cache_images/ubuntu_setup.sh index 34dedfd8..de13f919 100644 --- a/cache_images/ubuntu_setup.sh +++ b/cache_images/ubuntu_setup.sh @@ -23,7 +23,8 @@ bash $SCRIPT_DIRPATH/ubuntu_packaging.sh if ! ((CONTAINER)); then warn "Making Ubuntu kernel to enable cgroup swap accounting" - SEDCMD='s/^GRUB_CMDLINE_LINUX="(.*)"/GRUB_CMDLINE_LINUX="\1 cgroup_enable=memory swapaccount=1"/' + warn "Forcing CgroupsV1" + SEDCMD='s/^GRUB_CMDLINE_LINUX="(.*)"/GRUB_CMDLINE_LINUX="\1 cgroup_enable=memory swapaccount=1 systemd.unified_cgroup_hierarchy=0"/' ooe.sh $SUDO sed -re "$SEDCMD" -i /etc/default/grub.d/* ooe.sh $SUDO sed -re "$SEDCMD" -i /etc/default/grub ooe.sh $SUDO update-grub