aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/dockerfile/interoptest/grpc_interop_cxx
diff options
context:
space:
mode:
authorGravatar Sree Kuchibhotla <sreek@google.com>2016-10-17 14:15:50 -0700
committerGravatar Sree Kuchibhotla <sreek@google.com>2016-10-17 14:15:50 -0700
commit34ad82d6f683b06ecb3844769ef53784d8cba30b (patch)
tree27551d64348144de399c7f874adfedbf919458d3 /tools/dockerfile/interoptest/grpc_interop_cxx
parent923d641c27f0ebcceb67a28fd17168ac34e7bf5e (diff)
parent872559593329f1a6903d0b41f669eb4ba719dbe8 (diff)
Merge branch 'master' into new_scenario
Diffstat (limited to 'tools/dockerfile/interoptest/grpc_interop_cxx')
-rwxr-xr-xtools/dockerfile/interoptest/grpc_interop_cxx/build_interop.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/dockerfile/interoptest/grpc_interop_cxx/build_interop.sh b/tools/dockerfile/interoptest/grpc_interop_cxx/build_interop.sh
index 1c0828d23a..7a7ca0d3d1 100755
--- a/tools/dockerfile/interoptest/grpc_interop_cxx/build_interop.sh
+++ b/tools/dockerfile/interoptest/grpc_interop_cxx/build_interop.sh
@@ -32,7 +32,11 @@
set -e
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}')
# copy service account keys if available
cp -r /var/local/jenkins/service_account $HOME || true