diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2016-01-07 16:37:03 -0800 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2016-01-07 16:37:03 -0800 |
| commit | 7cc0f464d12696b0f5c26d3ad248215c9ff63c27 (patch) | |
| tree | c572b7fc730350ebd7ff3201ded323cfee9dad3f /tools/jenkins/build_docker_and_run_tests.sh | |
| parent | 54ed674d406e43a9c54ad103b5ea454d73a64c3b (diff) | |
| parent | abf85d96481a35d26ecfd16575f0a13846d3b8e5 (diff) | |
Merge github.com:grpc/grpc into proto_names
Diffstat (limited to 'tools/jenkins/build_docker_and_run_tests.sh')
| -rwxr-xr-x | tools/jenkins/build_docker_and_run_tests.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/jenkins/build_docker_and_run_tests.sh b/tools/jenkins/build_docker_and_run_tests.sh index 4ab9909f9f..175b3d5651 100755 --- a/tools/jenkins/build_docker_and_run_tests.sh +++ b/tools/jenkins/build_docker_and_run_tests.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2015, Google Inc. +# Copyright 2015-2016, Google Inc. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -64,6 +64,7 @@ docker run \ -e CCACHE_DIR=/tmp/ccache \ -e XDG_CACHE_HOME=/tmp/xdg-cache-home \ -e THIS_IS_REALLY_NEEDED='see https://github.com/docker/docker/issues/14203 for why docker is awful' \ + -e HOST_GIT_ROOT=$git_root \ -i $TTY_FLAG \ -v "$git_root:/var/local/jenkins/grpc" \ -v /tmp/ccache:/tmp/ccache \ @@ -78,7 +79,7 @@ docker run \ if [ "$XML_REPORT" != "" ] then - docker cp "$CONTAINER_NAME:/var/local/git/grpc/$XML_REPORT" $git_root + docker cp "$CONTAINER_NAME:/var/local/git/grpc/$XML_REPORT" $git_root || true fi docker cp "$CONTAINER_NAME:/var/local/git/grpc/reports.zip" $git_root || true |