From 5034885974cad089f73c51698e2022af272f15eb Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Wed, 14 Jul 2021 08:30:53 +0100 Subject: [PATCH] ci/openj9: run mrproper before make Make sure to remove all files created from previous local build before compiling in the container. Reported-by: Rajneesh Bhardwaj Signed-off-by: Radostin Stoyanov --- scripts/build/Dockerfile.openj9-alpine | 3 ++- scripts/build/Dockerfile.openj9-ubuntu | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/build/Dockerfile.openj9-alpine b/scripts/build/Dockerfile.openj9-alpine index 5f2f08df4..cf60756b8 100644 --- a/scripts/build/Dockerfile.openj9-alpine +++ b/scripts/build/Dockerfile.openj9-alpine @@ -1,4 +1,5 @@ FROM adoptopenjdk/openjdk8-openj9:alpine +ARG CC=gcc RUN apk update && apk add \ bash \ @@ -23,7 +24,7 @@ RUN apk update && apk add \ COPY . /criu WORKDIR /criu -RUN make +RUN make mrproper && make -j $(nproc) CC="$CC" ENTRYPOINT mvn -q -f test/javaTests/pom.xml test diff --git a/scripts/build/Dockerfile.openj9-ubuntu b/scripts/build/Dockerfile.openj9-ubuntu index abcd8cc1a..1e2eb41c0 100644 --- a/scripts/build/Dockerfile.openj9-ubuntu +++ b/scripts/build/Dockerfile.openj9-ubuntu @@ -1,4 +1,5 @@ FROM adoptopenjdk/openjdk8-openj9:latest +ARG CC=gcc COPY scripts/ci/apt-install /bin/apt-install @@ -27,7 +28,7 @@ RUN apt-install protobuf-c-compiler \ COPY . /criu WORKDIR /criu -RUN make +RUN make mrproper && make -j $(nproc) CC="$CC" ENTRYPOINT mvn -q -f test/javaTests/pom.xml test