mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-02 07:15:31 +00:00
Code Issues Releases Wiki Activity

travis: switch to the Ubuntu Xenial

Browse Source 
Signed-off-by: Andrei Vagin <avagin@gmail.com>
This commit is contained in:
Andrei Vagin
2018-11-27 20:45:45 +03:00
parent bc522bcc94
commit 02018f01f1
4 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -1,6 +1,6 @@
language: c language: c
sudo: required sudo: required
dist: trusty dist: xenial
cache: ccache cache: ccache
services: services:
- docker - docker

2
scripts/build/Dockerfile.fedora-asan.hdr
View File

@@ -1,2 +1,2 @@
FROM fedora:27 FROM fedora:29
ENV ASAN=1 ENV ASAN=1

16
scripts/travis/Makefile
View File

@@ -16,15 +16,23 @@ ZDTM_OPTIONS :=
alpine: ZDTM_OPTIONS=-x zdtm/static/binfmt_misc -x zdtm/static/netns-nf -x zdtm/static/sched_policy00 -x zdtm/static/seccomp_strict -x zdtm/static/sigaltstack -x zdtm/static/signalfd00 -x zdtm/static/config_inotify_irmap alpine: ZDTM_OPTIONS=-x zdtm/static/binfmt_misc -x zdtm/static/netns-nf -x zdtm/static/sched_policy00 -x zdtm/static/seccomp_strict -x zdtm/static/sigaltstack -x zdtm/static/signalfd00 -x zdtm/static/config_inotify_irmap
define DOCKER_JSON
{
"storage-driver": "devicemapper"
}
endef
export DOCKER_JSON
$(TARGETS): $(TARGETS):
echo 'DOCKER_OPTS="--storage-driver=devicemapper"' > /etc/default/docker echo "$$DOCKER_JSON" > /etc/docker/daemon.json
restart docker systemctl restart docker
$(MAKE) -C ../build $@$(target-suffix) $(MAKE) -C ../build $@$(target-suffix)
docker run --env-file docker.env --rm -it --privileged -v /lib/modules:/lib/modules --tmpfs /run criu-$@ scripts/travis/travis-tests docker run --env-file docker.env --rm -it --privileged -v /lib/modules:/lib/modules --tmpfs /run criu-$@ scripts/travis/travis-tests
fedora-asan: fedora-asan:
echo 'DOCKER_OPTS="--storage-driver=devicemapper"' > /etc/default/docker ip6tables -L -n
restart docker echo "$$DOCKER_JSON" > /etc/docker/daemon.json
systemctl restart docker
$(MAKE) -C ../build $@$(target-suffix) $(MAKE) -C ../build $@$(target-suffix)
docker run --rm -it --privileged -v /lib/modules:/lib/modules --tmpfs /run criu-$@ ./scripts/travis/asan.sh $(ZDTM_OPTIONS) docker run --rm -it --privileged -v /lib/modules:/lib/modules --tmpfs /run criu-$@ ./scripts/travis/asan.sh $(ZDTM_OPTIONS)

2
test/zdtm.py
View File

@@ -1740,7 +1740,7 @@ class Launcher:
if sub['log']: if sub['log']:
with open(sub['log']) as sublog: with open(sub['log']) as sublog:
print(sublog.read().encode('ascii', 'ignore')) print("%s" % sublog.read().encode('ascii', 'ignore').decode('utf-8'))
os.unlink(sub['log']) os.unlink(sub['log'])
return True return True