diff options
author | Josh Haberman <jhaberman@gmail.com> | 2016-03-03 17:08:37 -0800 |
---|---|---|
committer | Josh Haberman <jhaberman@gmail.com> | 2016-03-03 17:26:43 -0800 |
commit | 7d793c167f51d5afff18e13b1dc1c0b060b3aae4 (patch) | |
tree | 44f716ab6dfbc0065f9837d41197ac26297f3840 | |
parent | 2bda98f79ca9f43091d2033cf02c9732a0515a7a (diff) | |
download | protobuf-7d793c167f51d5afff18e13b1dc1c0b060b3aae4.tar.gz protobuf-7d793c167f51d5afff18e13b1dc1c0b060b3aae4.tar.bz2 protobuf-7d793c167f51d5afff18e13b1dc1c0b060b3aae4.zip |
Disable attempt to use ccache for docker build.
-rw-r--r-- | tools/docker/Dockerfile | 23 | ||||
-rwxr-xr-x | tools/jenkins/build_and_run_docker.sh | 8 | ||||
-rwxr-xr-x | tools/run_tests/jenkins.sh | 2 |
3 files changed, 13 insertions, 20 deletions
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index b7621f67..5136ee6b 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -62,6 +62,7 @@ RUN apt-get update && apt-get install -y \ libtool \ make \ parallel \ + time \ wget \ # -- For csharp -- mono-devel \ @@ -117,19 +118,6 @@ RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.1' >> ~/.bashrc" RUN /bin/bash -l -c "gem install bundler --no-ri --no-rdoc" ################## -# Prepare ccache - -# We do this BEFORE the Java dependency step below, so the build of protoc -# can benefit from it. -RUN ln -s /usr/bin/ccache /usr/local/bin/gcc -RUN ln -s /usr/bin/ccache /usr/local/bin/g++ -RUN ln -s /usr/bin/ccache /usr/local/bin/cc -RUN ln -s /usr/bin/ccache /usr/local/bin/c++ -RUN ln -s /usr/bin/ccache /usr/local/bin/clang -RUN ln -s /usr/bin/ccache /usr/local/bin/clang++ - - -################## # Java dependencies # This step requires compiling protoc. :( @@ -149,6 +137,15 @@ RUN cd /tmp && \ cd ../javanano && \ $MVN install dependency:go-offline -Dmaven.repo.local=$MAVEN_REPO +################## +# Prepare ccache + +RUN ln -s /usr/bin/ccache /usr/local/bin/gcc +RUN ln -s /usr/bin/ccache /usr/local/bin/g++ +RUN ln -s /usr/bin/ccache /usr/local/bin/cc +RUN ln -s /usr/bin/ccache /usr/local/bin/c++ +RUN ln -s /usr/bin/ccache /usr/local/bin/clang +RUN ln -s /usr/bin/ccache /usr/local/bin/clang++ # Define the default command. CMD ["bash"] diff --git a/tools/jenkins/build_and_run_docker.sh b/tools/jenkins/build_and_run_docker.sh index 18b910a7..ad1075fa 100755 --- a/tools/jenkins/build_and_run_docker.sh +++ b/tools/jenkins/build_and_run_docker.sh @@ -46,15 +46,13 @@ cd - # Use image name based on Dockerfile location checksum DOCKER_IMAGE_NAME=$(basename $DOCKERFILE_DIR)_$(sha1sum $DOCKERFILE_DIR/Dockerfile | cut -f1 -d\ ) +# Make sure docker image has been built. Should be instantaneous if so. +docker build -t $DOCKER_IMAGE_NAME $DOCKERFILE_DIR + # Ensure existence of ccache directory CCACHE_DIR=/tmp/protobuf-ccache mkdir -p $CCACHE_DIR -# Make sure docker image has been built. Should be instantaneous if so. -docker build \ - -v $CCACHE_DIR:$CCACHE_DIR \ - -t $DOCKER_IMAGE_NAME $DOCKERFILE_DIR - # Choose random name for docker container CONTAINER_NAME="build_and_run_docker_$(uuidgen)" diff --git a/tools/run_tests/jenkins.sh b/tools/run_tests/jenkins.sh index 0bd9ffe5..ea67345b 100755 --- a/tools/run_tests/jenkins.sh +++ b/tools/run_tests/jenkins.sh @@ -44,8 +44,6 @@ $TIME_CMD $TEST_SCRIPT cpp > >(tee $CPP_STDOUT) 2> >(tee $CPP_STDERR >&2) # Other tests are run in parallel. The overall run fails if any one of them # fails. -FAILED=false - parallel --results $LOG_OUTPUT_DIR --joblog $OUTPUT_DIR/joblog $TEST_SCRIPT ::: \ csharp \ java_jdk7 \ |