diff options
| author |  Matt Kwong <mattkwong@google.com> | 2016-09-22 17:15:15 -0700 |
|---|---|---|
| committer | Matt Kwong <mattkwong@google.com> | 2016-09-28 16:55:14 -0700 |
| commit | befac97048f42f55409bb38a34a75c38cbf34241 (patch) | |
| tree | 23e3517411e5223df434daff57dfb146db3c9c59 /tools/run_tests | |
| parent | b97f867b390193daf18988958183143726602727 (diff) | |
fixed local cloning of grpc/grpc submodules on docker
Diffstat (limited to 'tools/run_tests')
| -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..bb875e275e 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 + (cd var/local/git/grpc && exec git submodule | awk -v \ + EXTERNAL_GIT_ROOT=$EXTERNAL_GIT_ROOT '{ system("git submodule update --init \ + --reference " EXTERNAL_GIT_ROOT$2 " " $2) }') 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 8c6143d24f..5537158960 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 +(cd /var/local/git/grpc/ && exec git submodule | awk '{ system("git submodule \ +update --init --reference ./../../jenkins/grpc" $2 " " $2) }') mkdir -p reports |