diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-05-03 07:35:51 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-05-03 07:35:51 -0700 |
| commit | 0bc3b40b76d6527a497777fa72d2fa26053a963a (patch) | |
| tree | 1e572c74fdd798e98e1b833ac5b0da716a50ce6d /tools/internal_ci/linux/grpc_master.sh | |
| parent | 67e229e5c124efa826ef15e8a7e16634786fabeb (diff) | |
| parent | 892e4be6da9149a5fa7d3a4616ba0fa334828729 (diff) | |
Merge github.com:grpc/grpc into hiertune
Diffstat (limited to 'tools/internal_ci/linux/grpc_master.sh')
| -rwxr-xr-x | tools/internal_ci/linux/grpc_master.sh | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/tools/internal_ci/linux/grpc_master.sh b/tools/internal_ci/linux/grpc_master.sh index 9ecf123959..ec4bb2bda1 100755 --- a/tools/internal_ci/linux/grpc_master.sh +++ b/tools/internal_ci/linux/grpc_master.sh @@ -47,12 +47,4 @@ git submodule update --init # download docker images from dockerhub export DOCKERHUB_ORGANIZATION=grpctesting -tools/run_tests/run_tests.py -l c -t -x sponge_log.xml || FAILED="true" - -# kill port_server.py to prevent the build from hanging -ps aux | grep port_server\\.py | awk '{print $2}' | xargs kill -9 - -if [ "$FAILED" != "" ] -then - exit 1 -fi +tools/run_tests/run_tests_matrix.py -f basictests linux --internal_ci |