From 7ac85cab86ca2ee4b6c32bb877aeaf7cdc7c9c11 Mon Sep 17 00:00:00 2001 From: Alexander Mikhalitsyn Date: Thu, 7 Apr 2022 13:09:54 +0300 Subject: [PATCH] scripts/ci: fix ZDTM_OPTS variable passing We have a separate target for alpine in script/ci/Makefile which defines some extra opts for zdtm using ZDTM_OPTIONS variable. But really it doesn't work. First of all, variable should be named as ZDTM_OPTS and also we have to specify it directly in the CONTAINER_RUNTIME cmdline to make it work. I've also changed variable value just to make it consistent with docker.env value which was really used. Signed-off-by: Alexander Mikhalitsyn --- scripts/ci/Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/ci/Makefile b/scripts/ci/Makefile index eaab2f201..120f561e4 100644 --- a/scripts/ci/Makefile +++ b/scripts/ci/Makefile @@ -12,13 +12,13 @@ ifdef CLANG endif TARGETS := alpine fedora-rawhide centos7 centos8 archlinux -ZDTM_OPTIONS := +ZDTM_OPTS := UNAME := $(shell uname -m) export UNAME CONTAINER_RUNTIME := docker export CONTAINER_RUNTIME -alpine: ZDTM_OPTIONS=-x zdtm/static/binfmt_misc -x zdtm/static/netns-nf -x zdtm/static/sched_policy00 -x zdtm/static/seccomp_strict -x zdtm/static/sigaltstack -x zdtm/static/signalfd00 +alpine: ZDTM_OPTS=-x zdtm/static/binfmt_misc -x zdtm/static/sched_policy00 define DOCKER_JSON { @@ -66,13 +66,15 @@ restart-docker: systemctl status docker; \ fi +export ZDTM_OPTS + $(TARGETS): restart-docker $(MAKE) -C ../build $@$(target-suffix) - $(CONTAINER_RUNTIME) run --env-file docker.env $(CONTAINER_OPTS) criu-$@ scripts/ci/run-ci-tests.sh + $(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_OPTIONS) + $(CONTAINER_RUNTIME) run $(CONTAINER_OPTS) criu-$@ ./scripts/ci/asan.sh $(ZDTM_OPTS) docker-test: ./docker-test.sh