[CRIU] [PATCH] jenkins: use zdtm.py to run criu-sibling

Andrey Vagin avagin at openvz.org
Tue Oct 20 03:27:27 PDT 2015


From: Andrew Vagin <avagin at openvz.org>

Signed-off-by: Andrew Vagin <avagin at openvz.org>
---
 test/jenkins/criu-lib.sh     |  1 +
 test/jenkins/criu-sibling.sh | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/test/jenkins/criu-lib.sh b/test/jenkins/criu-lib.sh
index aa70d79..686be2c 100644
--- a/test/jenkins/criu-lib.sh
+++ b/test/jenkins/criu-lib.sh
@@ -8,6 +8,7 @@ function prep()
 	git clean -dfx &&
 	make -j 4 &&
 	make -j 4 -C test/zdtm/live &&
+	make -C test zdtm_ct &&
 	true
 }
 
diff --git a/test/jenkins/criu-sibling.sh b/test/jenkins/criu-sibling.sh
index 1132e28..17793e4 100644
--- a/test/jenkins/criu-sibling.sh
+++ b/test/jenkins/criu-sibling.sh
@@ -1,8 +1,8 @@
 # Make 3 iteration of dump/restore for each test
-
-source `dirname $0`/criu-lib.sh &&
-prep &&
-mkdir -p test/dump &&
-mount -t tmpfs dump test/dump &&
-make -C test -j 4 ZDTM_ARGS="-C --restore-sibling" zdtm &&
-true || fail
+set -e
+source `dirname $0`/criu-lib.sh
+prep
+mkdir -p test/dump
+mount -t tmpfs dump test/dump
+cd test
+./zdtm.py run --all --sibling --parallel 4
-- 
2.4.3



More information about the CRIU mailing list