diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4e830e53a..56bae35f3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -98,9 +98,16 @@ jobs: run: sudo -E PATH="$PATH" script -e -c 'make local${{ matrix.rootless }}integration' - name: integration test (systemd driver) - # can't use systemd driver with cgroupv1 - if: matrix.rootless != 'rootless' - run: sudo -E PATH="$PATH" script -e -c 'make RUNC_USE_SYSTEMD=yes local${{ matrix.rootless }}integration' + # Skip rootless+systemd for ubuntu 20.04 because of cgroup v1. + if: ${{ !(matrix.os == 'ubuntu-20.04' && matrix.rootless == 'rootless') }} + run: | + # Delegate all cgroup v2 controllers to rootless user via --systemd-cgroup. + # The default (since systemd v252) is "pids memory cpu". + sudo mkdir -p /etc/systemd/system/user@.service.d + printf "[Service]\nDelegate=yes\n" | sudo tee /etc/systemd/system/user@.service.d/delegate.conf + sudo systemctl daemon-reload + # Run the tests. + sudo -E PATH="$PATH" script -e -c 'make RUNC_USE_SYSTEMD=yes local${{ matrix.rootless }}integration' # We need to continue support for 32-bit ARM. # However, we do not have 32-bit ARM CI, so we use i386 for testing 32bit stuff.