Commit e4000c59 authored by Kir Kolyshkin's avatar Kir Kolyshkin Committed by Pavel Emelyanov

Dockerfiles: don't ignore make failures

Commit 299e4b4 ("travis: enable ccache for docker/qemu builds") combined
multiple RUN statements in Dockerfiles into a single one, which is good
for performance (as there is an intermediate cache created after each
statement). Unfortunately, it partially did so by combining statements
with use of semicolons, meaning we are ignoring non-zero exit codes.
As a result, failure from make are ignored and Travis builds are all
green.

To fix, replace all occurences of semicolon with &&.
Signed-off-by: 's avatarKir Kolyshkin <kir@openvz.org>
Signed-off-by: 's avatarAndrei Vagin <avagin@virtuozzo.com>
parent bc93f12a
...@@ -20,8 +20,8 @@ RUN apk update && apk add \ ...@@ -20,8 +20,8 @@ RUN apk update && apk add \
COPY . /criu COPY . /criu
WORKDIR /criu WORKDIR /criu
ENV CC="ccache $CC" CCACHE_DIR=/tmp/.ccache CCACHE_NOCOMPRESS=1 $ENV1=yes ENV CC="ccache $CC" CCACHE_DIR=/tmp/.ccache CCACHE_NOCOMPRESS=1 $ENV1=yes
RUN mv .ccache /tmp; make mrproper; ccache -s; \ RUN mv .ccache /tmp && make mrproper && ccache -s && \
date; make -j $(nproc) CC="$CC"; date date && make -j $(nproc) CC="$CC" && date
# Run a test # Run a test
RUN apk add py-yaml \ RUN apk add py-yaml \
......
...@@ -24,18 +24,18 @@ COPY . /criu ...@@ -24,18 +24,18 @@ COPY . /criu
WORKDIR /criu WORKDIR /criu
ENV CC="ccache $CC" CCACHE_DIR=/tmp/.ccache CCACHE_NOCOMPRESS=1 $ENV1=yes ENV CC="ccache $CC" CCACHE_DIR=/tmp/.ccache CCACHE_NOCOMPRESS=1 $ENV1=yes
RUN mv .ccache /tmp && make mrproper; ccache -s; \ RUN mv .ccache /tmp && make mrproper && ccache -s && \
date; \ date && \
# Check single object build # Check single object build
make -j $(nproc) CC="$CC" criu/parasite-syscall.o; \ make -j $(nproc) CC="$CC" criu/parasite-syscall.o && \
# Compile criu # Compile criu
make -j $(nproc) CC="$CC"; \ make -j $(nproc) CC="$CC" && \
date; \ date && \
# Check that "make mrproper" works # Check that "make mrproper" works
make mrproper && ! git clean -ndx --exclude=scripts/build \ make mrproper && ! git clean -ndx --exclude=scripts/build \
--exclude=.config --exclude=test | grep . --exclude=.config --exclude=test | grep .
# Compile tests # Compile tests
RUN date; make -j $(nproc) CC="$CC" -C test/zdtm; date RUN date && make -j $(nproc) CC="$CC" -C test/zdtm && date
#RUN make test/compel/handle_binary && ./test/compel/handle_binary #RUN make test/compel/handle_binary && ./test/compel/handle_binary
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment