diff options
author | Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com> | 2022-05-05 11:25:40 +0300 |
---|---|---|
committer | Andrei Vagin <avagin@gmail.com> | 2022-05-05 22:42:14 +0300 |
commit | 991f27c841f4db7587b0247da46c1d51fca0b8d4 (patch) | |
tree | 4ba0725e29ef2f571a20a9ee26b276a370da61c7 | |
parent | 0c1f0256ff56e1816fa97f060f5c46bfa7c86a15 (diff) |
ci: skip new hugetlb maps09/maps10 tests for pre-dump
This commit has to be reverted once we fix the issue.
Issue: https://github.com/checkpoint-restore/criu/issues/1868
Reported-by: Mr. Jenkins
Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
-rwxr-xr-x | test/jenkins/criu-dedup.sh | 2 | ||||
-rwxr-xr-x | test/jenkins/criu-lazy-migration.sh | 2 | ||||
-rwxr-xr-x | test/jenkins/criu-lazy-pages.sh | 2 | ||||
-rwxr-xr-x | test/jenkins/criu-pre-dump.sh | 5 | ||||
-rwxr-xr-x | test/jenkins/criu-remote-lazy-pages.sh | 2 | ||||
-rwxr-xr-x | test/jenkins/criu-snap.sh | 4 |
6 files changed, 9 insertions, 8 deletions
diff --git a/test/jenkins/criu-dedup.sh b/test/jenkins/criu-dedup.sh index edb1b653d..842d218bd 100755 --- a/test/jenkins/criu-dedup.sh +++ b/test/jenkins/criu-dedup.sh @@ -4,7 +4,7 @@ set -e source `dirname $0`/criu-lib.sh prep -./test/zdtm.py run --all --keep-going --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 -x maps09 -x maps10 || fail # Additionally run these tests as they touch a lot of # memory and it makes sense to additionally check it diff --git a/test/jenkins/criu-lazy-migration.sh b/test/jenkins/criu-lazy-migration.sh index 02a212e0d..b23f31c79 100755 --- a/test/jenkins/criu-lazy-migration.sh +++ b/test/jenkins/criu-lazy-migration.sh @@ -15,7 +15,7 @@ LAZY_MIGRATE_EXCLUDE="-x fifo_loop -x file_locks -x ptrace_sig -x overmount_file --lazy-migrate $LAZY_EXCLUDE $LAZY_MIGRATE_EXCLUDE || fail # During pre-dump + lazy-pages we leave VM_NOHUGEPAGE set -LAZY_EXCLUDE="$LAZY_EXCLUDE -x maps02" +LAZY_EXCLUDE="$LAZY_EXCLUDE -x maps02 -x maps09 -x maps10" # lazy restore from images with pre-dumps ./test/zdtm.py run --all --keep-going --report report --parallel 4 -f uns \ diff --git a/test/jenkins/criu-lazy-pages.sh b/test/jenkins/criu-lazy-pages.sh index 9ef721739..f62912090 100755 --- a/test/jenkins/criu-lazy-pages.sh +++ b/test/jenkins/criu-lazy-pages.sh @@ -12,7 +12,7 @@ source `dirname $0`/criu-lazy-common.sh --lazy-pages $LAZY_EXCLUDE || fail # During pre-dump + lazy-pages we leave VM_NOHUGEPAGE set -LAZY_EXCLUDE="$LAZY_EXCLUDE -x maps02" +LAZY_EXCLUDE="$LAZY_EXCLUDE -x maps02 -x maps09 -x maps10" # lazy restore from images with pre-dumps ./test/zdtm.py run --all --keep-going --report report --parallel 4 \ diff --git a/test/jenkins/criu-pre-dump.sh b/test/jenkins/criu-pre-dump.sh index 137f7c23f..b2972d941 100755 --- a/test/jenkins/criu-pre-dump.sh +++ b/test/jenkins/criu-pre-dump.sh @@ -5,5 +5,6 @@ set -e source `dirname $0`/criu-lib.sh prep mount_tmpfs_to_dump -./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 +# FIXME: https://github.com/checkpoint-restore/criu/issues/1868 +./test/zdtm.py run --all --keep-going --report report --parallel 4 --pre 3 -x 'maps04' -x 'maps09' -x 'maps10' || fail +./test/zdtm.py run --all --keep-going --report report --parallel 4 --pre 3 --page-server -x 'maps04' -x 'maps09' -x 'maps10' || fail diff --git a/test/jenkins/criu-remote-lazy-pages.sh b/test/jenkins/criu-remote-lazy-pages.sh index 1c677e333..48787f3f6 100755 --- a/test/jenkins/criu-remote-lazy-pages.sh +++ b/test/jenkins/criu-remote-lazy-pages.sh @@ -12,7 +12,7 @@ source `dirname $0`/criu-lazy-common.sh --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_EXCLUDE="$LAZY_EXCLUDE -x maps02 -x maps09 -x maps10" # lazy restore from "remote" dump with pre-dumps ./test/zdtm.py run --all --keep-going --report report --parallel 4 \ diff --git a/test/jenkins/criu-snap.sh b/test/jenkins/criu-snap.sh index b08c57f52..d8fdf02b3 100755 --- a/test/jenkins/criu-snap.sh +++ b/test/jenkins/criu-snap.sh @@ -5,5 +5,5 @@ set -e source `dirname $0`/criu-lib.sh prep mount_tmpfs_to_dump -./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 +./test/zdtm.py run --all --keep-going --report report --parallel 4 --pre 3 --snaps -x 'maps04' -x 'maps09' -x 'maps10' || fail +./test/zdtm.py run --all --keep-going --report report --parallel 4 --pre 3 --snaps --page-server -x 'maps04' -x 'maps09' -x 'maps10' || fail |