diff options
| author |  Noah Eisen <ncteisen@google.com> | 2016-10-12 15:04:45 -0700 |
|---|---|---|
| committer | Noah Eisen <ncteisen@google.com> | 2016-10-12 15:04:45 -0700 |
| commit | cece9c7368cab75444b3c34bb518a98d7f656759 (patch) | |
| tree | 27cf83a0d9244b678d479531f9d32630e0aef727 /tools/dockerfile/interoptest/grpc_interop_node/build_interop.sh | |
| parent | 2cef11c6674e67aea8e7f63f7ac2869e5d44a7c5 (diff) | |
| parent | d44144c3b2112ed61a21c08331bfe9e18664ceb3 (diff) | |
manually fixed merge conflict. caused by the addition of a different new interop test
Diffstat (limited to 'tools/dockerfile/interoptest/grpc_interop_node/build_interop.sh')
| -rwxr-xr-x | tools/dockerfile/interoptest/grpc_interop_node/build_interop.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/dockerfile/interoptest/grpc_interop_node/build_interop.sh b/tools/dockerfile/interoptest/grpc_interop_node/build_interop.sh index 976f55d9ab..4116f842ff 100755 --- a/tools/dockerfile/interoptest/grpc_interop_node/build_interop.sh +++ b/tools/dockerfile/interoptest/grpc_interop_node/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 |