fixed whitespacing and docker_run_tests.sh now clones submodule via network

pull/8182/head
Matt Kwong 9 years ago
parent 5d0f24600e
commit 10dcccadfb
  1. 5
      test/distrib/cpp/run_distrib_test.sh
  2. 2
      tools/dockerfile/grpc_check_generated_pb_files/check_pb_files.sh
  3. 2
      tools/dockerfile/interoptest/grpc_interop_csharp/build_interop.sh
  4. 2
      tools/dockerfile/interoptest/grpc_interop_csharpcoreclr/build_interop.sh
  5. 2
      tools/dockerfile/interoptest/grpc_interop_cxx/build_interop.sh
  6. 2
      tools/dockerfile/interoptest/grpc_interop_http2/build_interop.sh
  7. 2
      tools/dockerfile/interoptest/grpc_interop_node/build_interop.sh
  8. 3
      tools/dockerfile/interoptest/grpc_interop_php/build_interop.sh
  9. 3
      tools/dockerfile/interoptest/grpc_interop_php7/build_interop.sh
  10. 2
      tools/dockerfile/interoptest/grpc_interop_python/build_interop.sh
  11. 3
      tools/dockerfile/interoptest/grpc_interop_ruby/build_interop.sh
  12. 2
      tools/dockerfile/stress_test/grpc_interop_stress_csharp/build_interop_stress.sh
  13. 2
      tools/dockerfile/stress_test/grpc_interop_stress_cxx/build_interop_stress.sh
  14. 2
      tools/dockerfile/stress_test/grpc_interop_stress_go/build_interop_stress.sh
  15. 2
      tools/dockerfile/stress_test/grpc_interop_stress_java/build_interop_stress.sh
  16. 2
      tools/dockerfile/stress_test/grpc_interop_stress_node/build_interop_stress.sh
  17. 3
      tools/dockerfile/stress_test/grpc_interop_stress_php/build_interop_stress.sh
  18. 3
      tools/dockerfile/stress_test/grpc_interop_stress_python/build_interop_stress.sh
  19. 3
      tools/dockerfile/stress_test/grpc_interop_stress_ruby/build_interop_stress.sh
  20. 6
      tools/run_tests/dockerize/docker_run.sh
  21. 18
      tools/run_tests/dockerize/docker_run_tests.sh

@ -32,10 +32,9 @@ set -ex
git clone $EXTERNAL_GIT_ROOT
# 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} \
(cd ${EXTERNAL_GIT_ROOT} && git submodule foreach 'cd /var/local/git/grpc \
&& git submodule update --init --reference ${EXTERNAL_GIT_ROOT}/${name} \
${name}')
cd grpc

@ -33,7 +33,7 @@ set -e
mkdir -p /var/local/git
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 \
(cd /var/local/jenkins/grpc/ && git submodule foreach 'cd /var/local/git/grpc \
&& git submodule update --init --reference /var/local/jenkins/grpc/${name} \
${name}')

@ -34,7 +34,7 @@ set -e
mkdir -p /var/local/git
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 \
(cd /var/local/jenkins/grpc/ && git submodule foreach 'cd /var/local/git/grpc \
&& git submodule update --init --reference /var/local/jenkins/grpc/${name} \
${name}')

@ -34,7 +34,7 @@ set -e
mkdir -p /var/local/git
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 \
(cd /var/local/jenkins/grpc/ && git submodule foreach 'cd /var/local/git/grpc \
&& git submodule update --init --reference /var/local/jenkins/grpc/${name} \
${name}')

@ -34,7 +34,7 @@ set -e
mkdir -p /var/local/git
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 \
(cd /var/local/jenkins/grpc/ && git submodule foreach 'cd /var/local/git/grpc \
&& git submodule update --init --reference /var/local/jenkins/grpc/${name} \
${name}')

@ -34,7 +34,7 @@ set -e
mkdir -p /var/local/git
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 \
(cd /var/local/jenkins/grpc/ && git submodule foreach 'cd /var/local/git/grpc \
&& git submodule update --init --reference /var/local/jenkins/grpc/${name} \
${name}')

@ -34,7 +34,7 @@ set -e
mkdir -p /var/local/git
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 \
(cd /var/local/jenkins/grpc/ && git submodule foreach 'cd /var/local/git/grpc \
&& git submodule update --init --reference /var/local/jenkins/grpc/${name} \
${name}')

@ -34,7 +34,7 @@ set -ex
mkdir -p /var/local/git
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 \
(cd /var/local/jenkins/grpc/ && git submodule foreach 'cd /var/local/git/grpc \
&& git submodule update --init --reference /var/local/jenkins/grpc/${name} \
${name}')
@ -42,7 +42,6 @@ ${name}')
cp -r /var/local/jenkins/service_account $HOME || true
cd /var/local/git/grpc
rvm --default use ruby-2.1
# gRPC core and protobuf need to be installed

@ -34,7 +34,7 @@ set -ex
mkdir -p /var/local/git
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 \
(cd /var/local/jenkins/grpc/ && git submodule foreach 'cd /var/local/git/grpc \
&& git submodule update --init --reference /var/local/jenkins/grpc/${name} \
${name}')
@ -42,7 +42,6 @@ ${name}')
cp -r /var/local/jenkins/service_account $HOME || true
cd /var/local/git/grpc
rvm --default use ruby-2.1
# gRPC core and protobuf need to be installed

@ -34,7 +34,7 @@ set -e
mkdir -p /var/local/git
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 \
(cd /var/local/jenkins/grpc/ && git submodule foreach 'cd /var/local/git/grpc \
&& git submodule update --init --reference /var/local/jenkins/grpc/${name} \
${name}')

@ -34,7 +34,7 @@ set -e
mkdir -p /var/local/git
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 \
(cd /var/local/jenkins/grpc/ && git submodule foreach 'cd /var/local/git/grpc \
&& git submodule update --init --reference /var/local/jenkins/grpc/${name} \
${name}')
@ -42,7 +42,6 @@ ${name}')
cp -r /var/local/jenkins/service_account $HOME || true
cd /var/local/git/grpc
rvm --default use ruby-2.1
# build Ruby interop client and server

@ -34,7 +34,7 @@ set -e
mkdir -p /var/local/git
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 \
(cd /var/local/jenkins/grpc/ && git submodule foreach 'cd /var/local/git/grpc \
&& git submodule update --init --reference /var/local/jenkins/grpc/${name} \
${name}')

@ -34,7 +34,7 @@ set -e
mkdir -p /var/local/git
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 \
(cd /var/local/jenkins/grpc/ && git submodule foreach 'cd /var/local/git/grpc \
&& git submodule update --init --reference /var/local/jenkins/grpc/${name} \
${name}')

@ -40,7 +40,7 @@ git clone --recursive /var/local/jenkins/grpc-go src/google.golang.org/grpc
# grpc/tools/gcp/stress_tests
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 \
(cd /var/local/jenkins/grpc/ && git submodule foreach 'cd /var/local/git/grpc \
&& git submodule update --init --reference /var/local/jenkins/grpc/${name} \
${name}')

@ -38,7 +38,7 @@ git clone --recursive --depth 1 /var/local/jenkins/grpc-java /var/local/git/grpc
# grpc repo (for metrics client and for the stress test wrapper scripts)
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 \
(cd /var/local/jenkins/grpc/ && git submodule foreach 'cd /var/local/git/grpc \
&& git submodule update --init --reference /var/local/jenkins/grpc/${name} \
${name}')

@ -34,7 +34,7 @@ set -e
mkdir -p /var/local/git
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 \
(cd /var/local/jenkins/grpc/ && git submodule foreach 'cd /var/local/git/grpc \
&& git submodule update --init --reference /var/local/jenkins/grpc/${name} \
${name}')

@ -34,7 +34,7 @@ set -ex
mkdir -p /var/local/git
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 \
(cd /var/local/jenkins/grpc/ && git submodule foreach 'cd /var/local/git/grpc \
&& git submodule update --init --reference /var/local/jenkins/grpc/${name} \
${name}')
@ -42,7 +42,6 @@ ${name}')
cp -r /var/local/jenkins/service_account $HOME || true
cd /var/local/git/grpc
rvm --default use ruby-2.1
make install-certs

@ -34,7 +34,7 @@ set -e
mkdir -p /var/local/git
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 \
(cd /var/local/jenkins/grpc/ && git submodule foreach 'cd /var/local/git/grpc \
&& git submodule update --init --reference /var/local/jenkins/grpc/${name} \
${name}')
@ -42,7 +42,6 @@ ${name}')
cp -r /var/local/jenkins/service_account $HOME || true
cd /var/local/git/grpc
tools/run_tests/run_tests.py -l python -c opt --build_only
# Build c++ interop client

@ -34,7 +34,7 @@ set -e
mkdir -p /var/local/git
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 \
(cd /var/local/jenkins/grpc/ && git submodule foreach 'cd /var/local/git/grpc \
&& git submodule update --init --reference /var/local/jenkins/grpc/${name} \
${name}')
@ -42,7 +42,6 @@ ${name}')
cp -r /var/local/jenkins/service_account $HOME || true
cd /var/local/git/grpc
rvm --default use ruby-2.1
# Build Ruby interop client and server

@ -36,10 +36,10 @@ set -ex
if [ "$RELATIVE_COPY_PATH" == "" ]
then
mkdir -p /var/local/git
git clone "$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 /var/local/jenkins/grpc / && git submodule foreach 'cd /var/local/git/grpc \
&& git submodule update --init --reference /var/local/jenkins/grpc/${name} \
(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"

@ -43,10 +43,20 @@ chown $(whoami) $XDG_CACHE_HOME
mkdir -p /var/local/git
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}')
# (todo (mattkwong): the /var/local/jenkins/grpc has no submodules and boringssl
# has non-submodule files in it. Figure out how to fix this for local cloning
## this prints to console "reports reports.zip"
# ls /var/local/jenkins/grpc/third_party/boringssl
## none of these print anything (empty directory)
# ls /var/local/jenkins/grpc/third_party/gflags
# ls /var/local/jenkins/grpc/third_party/googletest
# ls /var/local/jenkins/grpc/third_party/nanopb
# ls /var/local/jenkins/grpc/third_party/protobuf
# ls /var/local/jenkins/grpc/third_party/thrift
# ls /var/local/jenkins/grpc/third_party/zlib
(cd /var/local/git/grpc && git submodule update --init --recursive )
mkdir -p reports

Loading…
Cancel
Save