mirror of
https://github.com/checkpoint-restore/criu.git
synced 2026-01-23 18:25:14 +00:00
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>
106 lines
2.7 KiB
Makefile
106 lines
2.7 KiB
Makefile
local:
|
|
./run-ci-tests.sh
|
|
.PHONY: local
|
|
|
|
after_success:
|
|
./ci-after-success.sh
|
|
.PHONY: after_success
|
|
|
|
target-suffix =
|
|
ifdef CLANG
|
|
target-suffix = -clang
|
|
endif
|
|
|
|
TARGETS := alpine fedora-rawhide centos7 centos8 archlinux
|
|
ZDTM_OPTS :=
|
|
UNAME := $(shell uname -m)
|
|
export UNAME
|
|
CONTAINER_RUNTIME := docker
|
|
export CONTAINER_RUNTIME
|
|
|
|
alpine: ZDTM_OPTS=-x zdtm/static/binfmt_misc -x zdtm/static/sched_policy00
|
|
|
|
define DOCKER_JSON
|
|
{
|
|
"storage-driver": "devicemapper"
|
|
}
|
|
endef
|
|
|
|
export DOCKER_JSON
|
|
|
|
ifeq ($(GITHUB_ACTIONS),true)
|
|
# GitHub Actions does not give us a real TTY and errors out with
|
|
# 'the input device is not a TTY' if using '-t'
|
|
CONTAINER_TERMINAL := -i
|
|
else
|
|
CONTAINER_TERMINAL := -it
|
|
endif
|
|
|
|
export CONTAINER_TERMINAL
|
|
|
|
ifeq ($(UNAME),x86_64)
|
|
# On anything besides x86_64 Travis is running unprivileged LXD
|
|
# containers which do not support running docker with '--privileged'.
|
|
CONTAINER_OPTS := --rm $(CONTAINER_TERMINAL) --privileged --userns=host --cgroupns=host -v /lib/modules:/lib/modules --tmpfs /run
|
|
else
|
|
CONTAINER_OPTS := --rm -v /lib/modules:/lib/modules --tmpfs /run
|
|
endif
|
|
|
|
ifeq ($(CONTAINER_RUNTIME),podman)
|
|
# Just as Docker needs to use devicemapper Podman needs vfs
|
|
# as graphdriver as overlayfs does not support all test cases
|
|
STORAGE_DRIVER := vfs
|
|
# Podman limits the number of processes in a container using cgroups.
|
|
# Disable it as it breaks the thread-bomb test
|
|
CONTAINER_OPTS += --pids-limit=0
|
|
endif
|
|
|
|
export STORAGE_DRIVER
|
|
|
|
restart-docker:
|
|
if [ "$$UNAME" = "x86_64" ] && [ "$$CONTAINER_RUNTIME" = "docker" ]; then \
|
|
echo "$$DOCKER_JSON" > /etc/docker/daemon.json; \
|
|
cat /etc/docker/daemon.json; \
|
|
systemctl status docker; \
|
|
systemctl restart docker; \
|
|
systemctl status docker; \
|
|
fi
|
|
|
|
export ZDTM_OPTS
|
|
|
|
$(TARGETS): restart-docker
|
|
$(MAKE) -C ../build $@$(target-suffix)
|
|
$(CONTAINER_RUNTIME) run --env-file docker.env $(if $(ZDTM_OPTS),-e ZDTM_OPTS) $(CONTAINER_OPTS) criu-$@ scripts/ci/run-ci-tests.sh
|
|
|
|
fedora-asan: restart-docker
|
|
$(MAKE) -C ../build $@$(target-suffix)
|
|
$(CONTAINER_RUNTIME) run $(CONTAINER_OPTS) criu-$@ ./scripts/ci/asan.sh $(ZDTM_OPTS)
|
|
|
|
docker-test:
|
|
./docker-test.sh
|
|
|
|
podman-test:
|
|
./podman-test.sh
|
|
|
|
# overlayfs behaves differently on Ubuntu and breaks CRIU
|
|
# https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1857257
|
|
# Switch to devicemapper
|
|
java-test: restart-docker
|
|
./java-test.sh
|
|
|
|
setup-vagrant:
|
|
./vagrant.sh setup
|
|
|
|
vagrant-fedora-no-vdso: setup-vagrant
|
|
./vagrant.sh fedora-no-vdso
|
|
|
|
vagrant-fedora-rawhide: setup-vagrant
|
|
./vagrant.sh fedora-rawhide
|
|
|
|
vagrant-fedora-non-root: setup-vagrant
|
|
./vagrant.sh fedora-non-root
|
|
|
|
.PHONY: setup-vagrant vagrant-fedora-no-vdso vagrant-fedora-rawhide vagrant-fedora-non-root
|
|
|
|
%:
|
|
$(MAKE) -C ../build $@$(target-suffix)
|