diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2017-04-29 14:17:40 +0200 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2017-04-29 14:17:40 +0200 |
| commit | 1c5068201bf38cf07d6bd657911c687fd7488c86 (patch) | |
| tree | d081791b7c7e0112988b9068170aff693761f16b /tools/internal_ci/linux | |
| parent | 365c52b47e8d322dfc0bdf15ddea2b598f3b4dbb (diff) | |
use run_tests_matrix.py for running internal_ci master tests
Diffstat (limited to 'tools/internal_ci/linux')
| -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 |