[CRIU] [PATCH] jenkins: change jenkins script to run full set of tests

Sergey Bronnikov sergeyb at openvz.org
Wed Mar 16 08:28:27 PDT 2016


add options --keep-going and --report (if it was absent)
to run full testrun with report creation

Signed-off-by: Sergey Bronnikov <sergeyb at openvz.org>
---
 test/jenkins/crit.sh          |  2 +-
 test/jenkins/criu-dedup.sh    |  6 +++---
 test/jenkins/criu-dump.sh     |  2 +-
 test/jenkins/criu-fault.sh    |  4 ++--
 test/jenkins/criu-fcg.sh      | 12 ++++++------
 test/jenkins/criu-groups.sh   |  2 +-
 test/jenkins/criu-inhfd.sh    |  2 +-
 test/jenkins/criu-iter.sh     |  2 +-
 test/jenkins/criu-overlay.sh  |  2 +-
 test/jenkins/criu-pre-dump.sh |  4 ++--
 test/jenkins/criu-sibling.sh  |  2 +-
 test/jenkins/criu-snap.sh     |  4 ++--
 test/jenkins/criu-user.sh     |  2 +-
 test/jenkins/criu.sh          |  2 +-
 14 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/test/jenkins/crit.sh b/test/jenkins/crit.sh
index 5c15694..807a1a2 100755
--- a/test/jenkins/crit.sh
+++ b/test/jenkins/crit.sh
@@ -2,6 +2,6 @@
 set -e
 source `dirname $0`/criu-lib.sh
 prep
-./test/zdtm.py run --all -f best -x maps04 -x cgroup02 --norst --keep always || fail
+./test/zdtm.py run --all -f best -x maps04 -x cgroup02 --norst --keep-going --report report --keep always || fail
 PYTHONPATH="$(pwd)/lib/" ./test/crit-recode.py || fail
 exit 0
diff --git a/test/jenkins/criu-dedup.sh b/test/jenkins/criu-dedup.sh
index ac2d543..8705a95 100755
--- a/test/jenkins/criu-dedup.sh
+++ b/test/jenkins/criu-dedup.sh
@@ -2,10 +2,10 @@
 set -e
 source `dirname $0`/criu-lib.sh
 prep
-./test/zdtm.py run --all --report report --parallel 4 -f h --pre 2 --dedup -x maps04 -x maps007 || fail
+./test/zdtm.py run --all --keep-going --report report --parallel 4 -f h --pre 2 --dedup -x maps04 -x maps007 || fail
 
 # Additionally run these two as they touch a lot of
 # memory and it makes sense to additionally check it
 # with delays petween iterations
-./test/zdtm.py run -t zdtm/transition/maps007 --report report -f h --pre 8:.1 --dedup || fail
-./test/zdtm.py run -t zdtm/static/mem-touch   --report report -f h --pre 8:.1 --dedup || fail
+./test/zdtm.py run -t zdtm/transition/maps007 --keep-going --report report -f h --pre 8:.1 --dedup || fail
+./test/zdtm.py run -t zdtm/static/mem-touch   --keep-going --report report -f h --pre 8:.1 --dedup || fail
diff --git a/test/jenkins/criu-dump.sh b/test/jenkins/criu-dump.sh
index 5703590..381cf7a 100755
--- a/test/jenkins/criu-dump.sh
+++ b/test/jenkins/criu-dump.sh
@@ -3,4 +3,4 @@ set -e
 source `dirname $0`/criu-lib.sh
 prep
 mount_tmpfs_to_dump
-./test/zdtm.py run --all --report report --parallel 4 --norst -x 'maps04' -x 'cgroup02' || fail
+./test/zdtm.py run --all --keep-going --report report --parallel 4 --norst -x 'maps04' -x 'cgroup02' || fail
diff --git a/test/jenkins/criu-fault.sh b/test/jenkins/criu-fault.sh
index 82f8f73..88783ce 100755
--- a/test/jenkins/criu-fault.sh
+++ b/test/jenkins/criu-fault.sh
@@ -2,5 +2,5 @@
 set -e
 source `dirname $0`/criu-lib.sh
 prep
-./test/zdtm.py run -t zdtm/static/env00 --fault 1 --report report -f h || fail
-./test/zdtm.py run -t zdtm/static/unlink_fstat00 --fault 2 --report report -f h || fail
+./test/zdtm.py run -t zdtm/static/env00 --fault 1 --keep-going --report report -f h || fail
+./test/zdtm.py run -t zdtm/static/unlink_fstat00 --fault 2 --keep-going --report report -f h || fail
diff --git a/test/jenkins/criu-fcg.sh b/test/jenkins/criu-fcg.sh
index a340cad..938a72f 100755
--- a/test/jenkins/criu-fcg.sh
+++ b/test/jenkins/criu-fcg.sh
@@ -4,10 +4,10 @@ source `dirname $0`/criu-lib.sh
 prep
 mount_tmpfs_to_dump
 
-./test/zdtm.py run -t zdtm/transition/thread-bomb -f h --report report --freezecg zdtm:f || fail
-./test/zdtm.py run -t zdtm/transition/thread-bomb -f h --report report --freezecg zdtm:f --pre 3 || fail
-./test/zdtm.py run -t zdtm/transition/thread-bomb -f h --report report --freezecg zdtm:f --norst || fail
+./test/zdtm.py run -t zdtm/transition/thread-bomb -f h --keep-going --report report --freezecg zdtm:f || fail
+./test/zdtm.py run -t zdtm/transition/thread-bomb -f h --keep-going --report report --freezecg zdtm:f --pre 3 || fail
+./test/zdtm.py run -t zdtm/transition/thread-bomb -f h --keep-going --report report --freezecg zdtm:f --norst || fail
 
-./test/zdtm.py run -t zdtm/transition/thread-bomb -f h --report report --freezecg zdtm:t || fail
-./test/zdtm.py run -t zdtm/transition/thread-bomb -f h --report report --freezecg zdtm:t --pre 3 || fail
-./test/zdtm.py run -t zdtm/transition/thread-bomb -f h --report report --freezecg zdtm:t --norst || fail
+./test/zdtm.py run -t zdtm/transition/thread-bomb -f h --keep-going --report report --freezecg zdtm:t || fail
+./test/zdtm.py run -t zdtm/transition/thread-bomb -f h --keep-going --report report --freezecg zdtm:t --pre 3 || fail
+./test/zdtm.py run -t zdtm/transition/thread-bomb -f h --keep-going --report report --freezecg zdtm:t --norst || fail
diff --git a/test/jenkins/criu-groups.sh b/test/jenkins/criu-groups.sh
index ff61f3b..508d20a 100755
--- a/test/jenkins/criu-groups.sh
+++ b/test/jenkins/criu-groups.sh
@@ -4,4 +4,4 @@ source `dirname $0`/criu-lib.sh
 prep
 mount_tmpfs_to_dump
 ./test/zdtm.py group --max 32 -x maps04 -x cgroup || fail
-./test/zdtm.py --set groups run --all --report report -f best || fail
+./test/zdtm.py --set groups run --all --keep-going --report report -f best || fail
diff --git a/test/jenkins/criu-inhfd.sh b/test/jenkins/criu-inhfd.sh
index 656374a..a59dcda 100755
--- a/test/jenkins/criu-inhfd.sh
+++ b/test/jenkins/criu-inhfd.sh
@@ -2,4 +2,4 @@
 set -e
 source `dirname $0`/criu-lib.sh
 prep
-./test//zdtm.py --set inhfd run --all -f h || fail
+./test//zdtm.py --set inhfd run --all --keep-going --report report -f h || fail
diff --git a/test/jenkins/criu-iter.sh b/test/jenkins/criu-iter.sh
index ff6938e..d414b05 100755
--- a/test/jenkins/criu-iter.sh
+++ b/test/jenkins/criu-iter.sh
@@ -3,4 +3,4 @@ set -e
 source `dirname $0`/criu-lib.sh
 prep
 mount_tmpfs_to_dump
-./test/zdtm.py run --all --report report --parallel 4 --iter 3 -x 'maps04' || fail
+./test/zdtm.py run --all --keep-going --report report --parallel 4 --iter 3 -x 'maps04' || fail
diff --git a/test/jenkins/criu-overlay.sh b/test/jenkins/criu-overlay.sh
index e21d7db..5ef7682 100755
--- a/test/jenkins/criu-overlay.sh
+++ b/test/jenkins/criu-overlay.sh
@@ -4,4 +4,4 @@ source `dirname $0`/criu-lib.sh
 prep
 mkdir -p test.up test.work
 mount -t overlay overlay -olowerdir=test,upperdir=test.up,workdir=test.work test
-./test/zdtm.py run --all --report report --parallel 4 -x inotify -x mntns_open -x socket -x sk-unix -x unlink -x fsnotify -x fanotify -x ghost || fail
+./test/zdtm.py run --all --keep-going --report report --parallel 4 -x inotify -x mntns_open -x socket -x sk-unix -x unlink -x fsnotify -x fanotify -x ghost || fail
diff --git a/test/jenkins/criu-pre-dump.sh b/test/jenkins/criu-pre-dump.sh
index 6d3775f..95f4d85 100755
--- a/test/jenkins/criu-pre-dump.sh
+++ b/test/jenkins/criu-pre-dump.sh
@@ -3,5 +3,5 @@ set -e
 source `dirname $0`/criu-lib.sh
 prep
 mount_tmpfs_to_dump
-./test/zdtm.py run --all --report report --parallel 4 --pre 3 -x 'maps04' || fail
-./test/zdtm.py run --all --report report --parallel 4 --pre 3 --page-server -x 'maps04' || fail
+./test/zdtm.py run --all --keep-going --report report --parallel 4 --pre 3 -x 'maps04' || fail
+./test/zdtm.py run --all --keep-going --report report --parallel 4 --pre 3 --page-server -x 'maps04' || fail
diff --git a/test/jenkins/criu-sibling.sh b/test/jenkins/criu-sibling.sh
index a8dcafe..93f0703 100755
--- a/test/jenkins/criu-sibling.sh
+++ b/test/jenkins/criu-sibling.sh
@@ -3,4 +3,4 @@ set -e
 source `dirname $0`/criu-lib.sh
 prep
 mount_tmpfs_to_dump
-./test/zdtm.py run --all --report report --sibling --parallel 4 -x 'maps04' || fail
+./test/zdtm.py run --all --keep-going --report report --sibling --parallel 4 -x 'maps04' || fail
diff --git a/test/jenkins/criu-snap.sh b/test/jenkins/criu-snap.sh
index 90c6389..d28ba45 100755
--- a/test/jenkins/criu-snap.sh
+++ b/test/jenkins/criu-snap.sh
@@ -3,5 +3,5 @@ set -e
 source `dirname $0`/criu-lib.sh
 prep
 mount_tmpfs_to_dump
-./test/zdtm.py run --all --report report --parallel 4 --pre 3 --snaps -x 'maps04' || fail
-./test/zdtm.py run --all --report report --parallel 4 --pre 3 --snaps --page-server -x 'maps04' || fail
+./test/zdtm.py run --all --keep-going --report report --parallel 4 --pre 3 --snaps -x 'maps04' || fail
+./test/zdtm.py run --all --keep-going --report report --parallel 4 --pre 3 --snaps --page-server -x 'maps04' || fail
diff --git a/test/jenkins/criu-user.sh b/test/jenkins/criu-user.sh
index 20329bf..f718e24 100755
--- a/test/jenkins/criu-user.sh
+++ b/test/jenkins/criu-user.sh
@@ -3,4 +3,4 @@ set -e
 source `dirname $0`/criu-lib.sh
 prep
 mount_tmpfs_to_dump
-./test/zdtm.py run --all --report report --parallel 4 --user --norst -x 'maps04' || fail
+./test/zdtm.py run --all --keep-going --report report --parallel 4 --user --norst -x 'maps04' || fail
diff --git a/test/jenkins/criu.sh b/test/jenkins/criu.sh
index 6964326..19d545c 100755
--- a/test/jenkins/criu.sh
+++ b/test/jenkins/criu.sh
@@ -2,4 +2,4 @@
 set -e
 source `dirname $0`/criu-lib.sh
 prep
-./test/zdtm.py run --all --report report --parallel 4 || fail
+./test/zdtm.py run --all --keep-going --report report --parallel 4 || fail
-- 
2.5.0


-- 
sergeyb@


More information about the CRIU mailing list