[CRIU] [PATCH] jenkins: lazy-pages: split lazy-pages runs to local and remote

[Andrei Vagin]

Applied, thanks
On Thu, Sep 14, 2017 at 07:52:05AM -0700, Mike Rapoport wrote:
> Signed-off-by: Mike Rapoport <rppt at linux.vnet.ibm.com>
> ---
>  test/jenkins/criu-lazy-pages.sh        |  8 --------
>  test/jenkins/criu-remote-lazy-pages.sh | 25 +++++++++++++++++++++++++
>  2 files changed, 25 insertions(+), 8 deletions(-)
>  create mode 100755 test/jenkins/criu-remote-lazy-pages.sh
> 
> diff --git a/test/jenkins/criu-lazy-pages.sh b/test/jenkins/criu-lazy-pages.sh
> index cdbbf2a..474cb3c 100755
> --- a/test/jenkins/criu-lazy-pages.sh
> +++ b/test/jenkins/criu-lazy-pages.sh
> @@ -17,17 +17,9 @@ fi
>  ./test/zdtm.py run --all --keep-going --report report --parallel 4 \
>  	       --lazy-pages $LAZY_EXCLUDE || fail
>  
> -# lazy restore from "remote" dump
> -./test/zdtm.py run --all --keep-going --report report --parallel 4 \
> -	       --remote-lazy-pages $LAZY_EXCLUDE -x maps04 || fail
> -
>  # During pre-dump + lazy-pages we leave VM_NOHUGEPAGE set
>  LAZY_EXCLUDE="$LAZY_EXCLUDE -x maps02"
>  
>  # lazy restore from images with pre-dumps
>  ./test/zdtm.py run --all --keep-going --report report --parallel 4 \
>  	       --lazy-pages --pre 2 $LAZY_EXCLUDE || fail
> -
> -# lazy restore from "remote" dump with pre-dumps
> -./test/zdtm.py run --all --keep-going --report report --parallel 4 \
> -	       --remote-lazy-pages --pre 2 $LAZY_EXCLUDE || fail
> diff --git a/test/jenkins/criu-remote-lazy-pages.sh b/test/jenkins/criu-remote-lazy-pages.sh
> new file mode 100755
> index 0000000..7d67102
> --- /dev/null
> +++ b/test/jenkins/criu-remote-lazy-pages.sh
> @@ -0,0 +1,25 @@
> +# Check remote-lazy-pages
> +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"
> +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
> +
> +# lazy restore from "remote" dump
> +./test/zdtm.py run --all --keep-going --report report --parallel 4 \
> +	       --remote-lazy-pages $LAZY_EXCLUDE -x maps04 || fail
> +
> +# During pre-dump + lazy-pages we leave VM_NOHUGEPAGE set
> +LAZY_EXCLUDE="$LAZY_EXCLUDE -x maps02"
> +
> +# lazy restore from "remote" dump with pre-dumps
> +./test/zdtm.py run --all --keep-going --report report --parallel 4 \
> +	       --remote-lazy-pages --pre 2 $LAZY_EXCLUDE || fail
> -- 
> 2.7.4
>