diff options
| -rw-r--r-- | scripts/ci/Makefile | 8 | ||||
| -rwxr-xr-x | scripts/ci/run-ci-tests.sh | 5 |
2 files changed, 6 insertions, 7 deletions
diff --git a/scripts/ci/Makefile b/scripts/ci/Makefile index 48a1e1887..30dd9ebeb 100644 --- a/scripts/ci/Makefile +++ b/scripts/ci/Makefile @@ -1,10 +1,4 @@ -# Umount cpuset in cgroupv1 to make it move to cgroupv2 -cpuset-cgroupv2: - if [ -d /sys/fs/cgroup/cpuset ]; then \ - umount /sys/fs/cgroup/cpuset; \ - fi - -local: cpuset-cgroupv2 +local: ./run-ci-tests.sh .PHONY: local diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh index 1b761ea56..7b64c6b06 100755 --- a/scripts/ci/run-ci-tests.sh +++ b/scripts/ci/run-ci-tests.sh @@ -144,6 +144,11 @@ time make unittest [ -n "$SKIP_CI_TEST" ] && exit 0 +# Umount cpuset in cgroupv1 to make it move to cgroupv2 +if [ -d /sys/fs/cgroup/cpuset ]; then + umount /sys/fs/cgroup/cpuset +fi + ulimit -c unlimited cgid=$$ |