Skip to content

Commit

Permalink
ci: skip new hugetlb maps09/maps10 tests for pre-dump
Browse files Browse the repository at this point in the history
This commit has to be reverted once we fix the issue.

Issue: checkpoint-restore#1868

Reported-by: Mr. Jenkins
Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
  • Loading branch information
mihalicyn authored and avagin committed May 5, 2022
1 parent 6ba0377 commit 37ea8c5
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion test/jenkins/criu-dedup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/jenkins/criu-lazy-migration.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion test/jenkins/criu-lazy-pages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
5 changes: 3 additions & 2 deletions test/jenkins/criu-pre-dump.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion test/jenkins/criu-remote-lazy-pages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions test/jenkins/criu-snap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 37ea8c5

Please sign in to comment.