diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-10-12 12:09:37 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-10-12 12:09:37 +0200 |
| commit | 53cba4a153f3e291f1b10015d1686f4f194cda7b (patch) | |
| tree | 47d5928548bfab5cc3e0fd02a9990a4714013140 /tools/run_tests/dockerize | |
| parent | 352e9a3e28627e6d7c106edc35c77205a301428d (diff) | |
| parent | 41c06a2ed563e31add33212dd861f554fc426c2b (diff) | |
Merge pull request #8182 from matt-kwong/fix_docker_local_clone
Fixed local cloning of grpc/grpc submodules on docker
Diffstat (limited to 'tools/run_tests/dockerize')
| -rwxr-xr-x | tools/run_tests/dockerize/docker_run.sh | 6 | ||||
| -rwxr-xr-x | tools/run_tests/dockerize/docker_run_tests.sh | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/tools/run_tests/dockerize/docker_run.sh b/tools/run_tests/dockerize/docker_run.sh index f04b1cfb55..ee8d288fb2 100755 --- a/tools/run_tests/dockerize/docker_run.sh +++ b/tools/run_tests/dockerize/docker_run.sh @@ -36,7 +36,11 @@ set -ex if [ "$RELATIVE_COPY_PATH" == "" ] then mkdir -p /var/local/git - git clone --recursive "$EXTERNAL_GIT_ROOT" /var/local/git/grpc + git clone $EXTERNAL_GIT_ROOT /var/local/git/grpc + # clone gRPC submodules, use data from locally cloned submodules where possible + (cd ${EXTERNAL_GIT_ROOT} && git submodule foreach 'cd /var/local/git/grpc \ + && git submodule update --init --reference ${EXTERNAL_GIT_ROOT}/${name} \ + ${name}') else mkdir -p "/var/local/git/grpc/$RELATIVE_COPY_PATH" cp -r "$EXTERNAL_GIT_ROOT/$RELATIVE_COPY_PATH"/* "/var/local/git/grpc/$RELATIVE_COPY_PATH" diff --git a/tools/run_tests/dockerize/docker_run_tests.sh b/tools/run_tests/dockerize/docker_run_tests.sh index ef02d26625..eb220ae416 100755 --- a/tools/run_tests/dockerize/docker_run_tests.sh +++ b/tools/run_tests/dockerize/docker_run_tests.sh @@ -42,7 +42,11 @@ export PATH=$PATH:/usr/bin/llvm-symbolizer chown $(whoami) $XDG_CACHE_HOME mkdir -p /var/local/git -git clone --recursive /var/local/jenkins/grpc /var/local/git/grpc +git clone /var/local/jenkins/grpc /var/local/git/grpc +# clone gRPC submodules, use data from locally cloned submodules where possible +(cd /var/local/jenkins/grpc/ && git submodule foreach 'cd /var/local/git/grpc \ +&& git submodule update --init --reference /var/local/jenkins/grpc/${name} \ +${name}') mkdir -p reports |