diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2018-08-09 15:22:22 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2018-08-09 15:22:22 -0700 |
| commit | f0b8a57fe64286da5781385a6318faba0cbad9dc (patch) | |
| tree | c9a91d827c89972b856a5b482043833398a46833 /kokoro/linux/build_and_run_docker.sh | |
| parent | c9a30c2c279431466e30541ac7c2cd9776c93b9c (diff) | |
| download | protobuf-f0b8a57fe64286da5781385a6318faba0cbad9dc.tar.gz protobuf-f0b8a57fe64286da5781385a6318faba0cbad9dc.tar.bz2 protobuf-f0b8a57fe64286da5781385a6318faba0cbad9dc.zip | |
Cleanup kokoro scripts.
Changes:
1. Remove stuff no longer needed. Lots of the heavy lifting were there
because we were running our own jenkins cluster and had to manage all
the test logs ourselves. Now they are useless.
2. Change "-j2" to "-j4" to speed up the test a little bit. Kokoro
machines have 4 logic CPUs according to their spec.
Diffstat (limited to 'kokoro/linux/build_and_run_docker.sh')
| -rwxr-xr-x | kokoro/linux/build_and_run_docker.sh | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/kokoro/linux/build_and_run_docker.sh b/kokoro/linux/build_and_run_docker.sh index f9c60710..b81a3684 100755 --- a/kokoro/linux/build_and_run_docker.sh +++ b/kokoro/linux/build_and_run_docker.sh @@ -8,7 +8,6 @@ # OUTPUT_DIR - Directory that will be copied from inside docker after finishing. # $@ - Extra args to pass to docker run - set -ex cd $(dirname $0)/../.. @@ -39,7 +38,6 @@ docker run \ -e KOKORO_BUILD_ID=$KOKORO_BUILD_ID \ -e EXTERNAL_GIT_ROOT="/var/local/kokoro/protobuf" \ -e TEST_SET="$TEST_SET" \ - -e THIS_IS_REALLY_NEEDED='see https://github.com/docker/docker/issues/14203 for why docker is awful' \ -v "$git_root:/var/local/kokoro/protobuf:ro" \ -v $CCACHE_DIR:$CCACHE_DIR \ -w /var/local/git/protobuf \ @@ -47,16 +45,9 @@ docker run \ $DOCKER_IMAGE_NAME \ bash -l "/var/local/kokoro/protobuf/$DOCKER_RUN_SCRIPT" || FAILED="true" -# Copy output artifacts -if [ "$OUTPUT_DIR" != "" ] -then - docker cp "$CONTAINER_NAME:/var/local/git/protobuf/$OUTPUT_DIR" "${git_root}/kokoro" || FAILED="true" -fi - # remove the container, possibly killing it first docker rm -f $CONTAINER_NAME || true -if [ "$FAILED" != "" ] -then +[ -z "$FAILED" ] || { exit 1 -fi +} |