diff options
| author | Adrian Reber <areber@redhat.com> | 2022-11-07 10:26:10 +0300 |
|---|---|---|
| committer | Radostin Stoyanov <rstoyanov@fedoraproject.org> | 2022-11-08 14:24:01 +0300 |
| commit | 979c84209bc2662b9bd2666702906de4e11190a9 (patch) | |
| tree | 5969803455868b42c89800eae2ad6f326df67e84 | |
| parent | f47f5c084120d1d9dae7d19d466391e02c05fcce (diff) | |
ci: move cgroup unmounting to run-ci-tests.sh
A previous commit added a cgroup cpuset unmounting to
scripts/ci/Makefile. We are sometimes running in a container without the
necessary privileges to unmount certain cgroups.
This commit moves the cgroup unmounting to a place in run-ci-tests.sh
which already requires privileged access and does not break unprivileged
build-only CI runs.
Signed-off-by: Adrian Reber <areber@redhat.com>
| -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=$$ |