diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2017-05-02 22:29:02 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-05-02 22:29:02 +0200 |
| commit | d01ef0a24814dd78d5690b9648401d9165de813d (patch) | |
| tree | 58d17746f2cac9426b8bd8563258aa9fdff7a6a5 | |
| parent | 3afae71fb62a4dc2956bd038c9537e614c5ca56d (diff) | |
| parent | 1c5068201bf38cf07d6bd657911c687fd7488c86 (diff) | |
Merge pull request #10922 from jtattermusch/master_tests_for_real
Use run_tests_matrix.py for running internal_ci master tests
| -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 |