diff options
| author |  David G. Quintas <dgq@google.com> | 2016-02-23 11:19:01 -0800 |
|---|---|---|
| committer | David G. Quintas <dgq@google.com> | 2016-02-23 11:19:01 -0800 |
| commit | 0a5f61325a69fe90e74f974fc00866163b4f4af0 (patch) | |
| tree | 8a8a361be62d9a80b7bda2c193a8737f7aa5798d /tools/jenkins | |
| parent | 4938274d479d7480c993c4e6ffb32a0d8dd95eb8 (diff) | |
| parent | 70ab4c5cef079518f5b5a6a7e4b45e3d0f61c6f1 (diff) | |
Merge pull request #5213 from ctiller/fix-proto-docker
Proto API for LB request/responses (redux)
Diffstat (limited to 'tools/jenkins')
| -rwxr-xr-x | tools/jenkins/build_docker_and_run_tests.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/jenkins/build_docker_and_run_tests.sh b/tools/jenkins/build_docker_and_run_tests.sh index e2ac7518f0..daa29b2f94 100755 --- a/tools/jenkins/build_docker_and_run_tests.sh +++ b/tools/jenkins/build_docker_and_run_tests.sh @@ -60,6 +60,9 @@ docker build -t $DOCKER_IMAGE_NAME $DOCKERFILE_DIR # Choose random name for docker container CONTAINER_NAME="run_tests_$(uuidgen)" +# Git root as seen by the docker instance +docker_instance_git_root=/var/local/jenkins/grpc + # Run tests inside docker docker run \ -e "RUN_TESTS_COMMAND=$RUN_TESTS_COMMAND" \ @@ -69,9 +72,10 @@ docker run \ -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 \ + -e LOCAL_GIT_ROOT=$docker_instance_git_root \ -e "BUILD_ID=$BUILD_ID" \ -i $TTY_FLAG \ - -v "$git_root:/var/local/jenkins/grpc" \ + -v "$git_root:$docker_instance_git_root" \ -v /tmp/ccache:/tmp/ccache \ -v /tmp/npm-cache:/tmp/npm-cache \ -v /tmp/xdg-cache-home:/tmp/xdg-cache-home \ |