[CRIU] [PATCH 2/3] jenkins: split common part of lazy pages tests into a separate file

Mike Rapoport rppt at linux.vnet.ibm.com
Tue Oct 2 15:20:30 MSK 2018


Signed-off-by: Mike Rapoport <rppt at linux.vnet.ibm.com>
---
 test/jenkins/criu-lazy-common.sh       |  9 +++++++++
 test/jenkins/criu-lazy-migration.sh    | 10 +---------
 test/jenkins/criu-lazy-pages.sh        | 10 +---------
 test/jenkins/criu-remote-lazy-pages.sh | 10 +---------
 4 files changed, 12 insertions(+), 27 deletions(-)
 create mode 100644 test/jenkins/criu-lazy-common.sh

diff --git a/test/jenkins/criu-lazy-common.sh b/test/jenkins/criu-lazy-common.sh
new file mode 100644
index 0000000..a1a77dd
--- /dev/null
+++ b/test/jenkins/criu-lazy-common.sh
@@ -0,0 +1,9 @@
+KERN_MAJ=`uname -r | cut -d. -f1`
+KERN_MIN=`uname -r | cut -d. -f2`
+if [ $KERN_MAJ -ge "4" ] && [ $KERN_MIN -ge "11" ]; then
+	LAZY_EXCLUDE="-x cmdlinenv00 -x maps007"
+else
+	LAZY_EXCLUDE="-x maps007 -x fork -x fork2 -x uffd-events -x cgroupns
+		      -x socket_listen -x socket_listen6 -x cmdlinenv00
+		      -x socket_close_data01 -x file_read"
+fi
diff --git a/test/jenkins/criu-lazy-migration.sh b/test/jenkins/criu-lazy-migration.sh
index 78ea2bf..cf0ab04 100755
--- a/test/jenkins/criu-lazy-migration.sh
+++ b/test/jenkins/criu-lazy-migration.sh
@@ -3,15 +3,7 @@ set -e
 source `dirname $0`/criu-lib.sh
 prep
 
-KERN_MAJ=`uname -r | cut -d. -f1`
-KERN_MIN=`uname -r | cut -d. -f2`
-if [ $KERN_MAJ -ge "4" ] && [ $KERN_MIN -ge "11" ]; then
-	LAZY_EXCLUDE="-x cmdlinenv00 -x maps007"
-else
-	LAZY_EXCLUDE="-x maps007 -x fork -x fork2 -x uffd-events -x cgroupns
-		      -x socket_listen -x socket_listen6 -x cmdlinenv00
-		      -x socket_close_data01 -x file_read"
-fi
+source `dirname $0`/criu-lazy-common.sh
 
 # These tests seem to require complete separation of dump and restore namespaces
 LAZY_MIGRATE_EXCLUDE="-x fifo_loop -x file_locks -x ptrace_sig -x overmount_file  -x file_lease -x cr_veth -x fifo -x overmount_sock -x unlink_largefile -x socket_udp-corked -x netns_sub_veth"
diff --git a/test/jenkins/criu-lazy-pages.sh b/test/jenkins/criu-lazy-pages.sh
index f31098c..a3ee9a4 100755
--- a/test/jenkins/criu-lazy-pages.sh
+++ b/test/jenkins/criu-lazy-pages.sh
@@ -3,15 +3,7 @@ set -e
 source `dirname $0`/criu-lib.sh
 prep
 
-KERN_MAJ=`uname -r | cut -d. -f1`
-KERN_MIN=`uname -r | cut -d. -f2`
-if [ $KERN_MAJ -ge "4" ] && [ $KERN_MIN -ge "11" ]; then
-	LAZY_EXCLUDE="-x cmdlinenv00 -x maps007"
-else
-	LAZY_EXCLUDE="-x maps007 -x fork -x fork2 -x uffd-events -x cgroupns
-		      -x socket_listen -x socket_listen6 -x cmdlinenv00
-		      -x socket_close_data01 -x file_read"
-fi
+source `dirname $0`/criu-lazy-common.sh
 
 # lazy restore from images
 ./test/zdtm.py run --all --keep-going --report report --parallel 4 \
diff --git a/test/jenkins/criu-remote-lazy-pages.sh b/test/jenkins/criu-remote-lazy-pages.sh
index 122aea7..ea0d17f 100755
--- a/test/jenkins/criu-remote-lazy-pages.sh
+++ b/test/jenkins/criu-remote-lazy-pages.sh
@@ -3,15 +3,7 @@ set -e
 source `dirname $0`/criu-lib.sh
 prep
 
-KERN_MAJ=`uname -r | cut -d. -f1`
-KERN_MIN=`uname -r | cut -d. -f2`
-if [ $KERN_MAJ -ge "4" ] && [ $KERN_MIN -ge "11" ]; then
-	LAZY_EXCLUDE="-x cmdlinenv00 -x maps007"
-else
-	LAZY_EXCLUDE="-x maps007 -x fork -x fork2 -x uffd-events -x cgroupns
-		      -x socket_listen -x socket_listen6 -x cmdlinenv00
-		      -x socket_close_data01 -x file_read"
-fi
+source `dirname $0`/criu-lazy-common.sh
 
 # lazy restore from "remote" dump
 ./test/zdtm.py run --all --keep-going --report report --parallel 4 \
-- 
2.7.4



More information about the CRIU mailing list