diff options
author | murgatroid99 <mlumish@google.com> | 2018-05-07 10:31:41 -0700 |
---|---|---|
committer | murgatroid99 <mlumish@google.com> | 2018-05-07 10:31:41 -0700 |
commit | cd1172c9dd3b346d261835bb7c6fdd94556a53b2 (patch) | |
tree | cbfc75375954bc52521b846269016f259d1fc063 /tools | |
parent | aef957950aa3390e3516531ca2d783de8fc9333b (diff) |
Revert recent changes to node interop build script
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/dockerfile/interoptest/grpc_interop_node/build_interop.sh | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/tools/dockerfile/interoptest/grpc_interop_node/build_interop.sh b/tools/dockerfile/interoptest/grpc_interop_node/build_interop.sh index 21fdd0b490..c16efc1d35 100755 --- a/tools/dockerfile/interoptest/grpc_interop_node/build_interop.sh +++ b/tools/dockerfile/interoptest/grpc_interop_node/build_interop.sh @@ -17,23 +17,12 @@ set -e mkdir -p /var/local/git - git clone /var/local/jenkins/grpc-node /var/local/git/grpc-node # clone gRPC submodules, use data from locally cloned submodules where possible (cd /var/local/jenkins/grpc-node/ && git submodule foreach 'cd /var/local/git/grpc-node \ && git submodule update --init --recursive --reference /var/local/jenkins/grpc-node/${name} \ ${name}') -# Use the pending c-core changes if possible -if [ -d "/var/local/jenkins/grpc" ]; then - cd /var/local/jenkins/grpc - CURRENT_COMMIT="$(git rev-parse --verify HEAD)" - cd /var/local/git/grpc-node/packages/grpc-native-core/deps/grpc/ - git fetch --tags --progress https://github.com/grpc/grpc.git +refs/pull/*:refs/remotes/origin/pr/* - git checkout $CURRENT_COMMIT - git submodule update --init --recursive --reference /var/local/jenkins/grpc -fi - # copy service account keys if available cp -r /var/local/jenkins/service_account $HOME || true |