From 0ecd9c2b28dda07f5143430d875782dc4e581397 Mon Sep 17 00:00:00 2001 From: Andrei Vagin Date: Tue, 7 Feb 2017 23:52:00 +0300 Subject: [PATCH] travis: execute tests on Alpine "zdtm.py run -a" doesn't work on Alpine: find: unrecognized: -executable So run zdtm/static/env00 for now to be sure that it is not broken at all. travis-ci: success for travis: execute tests on Alpine Signed-off-by: Andrei Vagin Signed-off-by: Pavel Emelyanov --- .travis.yml | 2 +- scripts/build/Dockerfile.alpine | 11 +++++++++++ scripts/travis/Makefile | 4 ++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 85d653f00..70d666d8f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,11 +6,11 @@ services: env: - TR_ARCH=local GCOV=1 - TR_ARCH=local CLANG=1 + - TR_ARCH=alpine - TR_ARCH=x86_64 - TR_ARCH=armv7hf - TR_ARCH=aarch64 - TR_ARCH=ppc64le - - TR_ARCH=alpine - TR_ARCH=armv7hf CLANG=1 - TR_ARCH=aarch64 CLANG=1 - TR_ARCH=ppc64le CLANG=1 diff --git a/scripts/build/Dockerfile.alpine b/scripts/build/Dockerfile.alpine index 56e16342e..86738a748 100644 --- a/scripts/build/Dockerfile.alpine +++ b/scripts/build/Dockerfile.alpine @@ -13,6 +13,17 @@ RUN apk update && apk add \ pkgconfig \ libnet-dev \ $CC + COPY . /criu WORKDIR /criu RUN make mrproper && make -j $(nproc) CC=$CC + +# to run tests +RUN apk add py-yaml \ + py-pip \ + ip6tables \ + iptables \ + iproute2 + +RUN pip install protobuf +RUN make -C test/zdtm/static env00 diff --git a/scripts/travis/Makefile b/scripts/travis/Makefile index ee0abacc2..37721aa8f 100644 --- a/scripts/travis/Makefile +++ b/scripts/travis/Makefile @@ -6,5 +6,9 @@ after_success: ./travis-after_success .PHONY: after_success +alpine: + $(MAKE) -C ../build alpine + docker run --rm -it --privileged -v /lib/modules:/lib/modules criu-alpine ./test/zdtm.py run -t zdtm/static/env00 + %: $(MAKE) -C ../build $@