diff options
| author |  Matt Kwong <mattkwong@google.com> | 2017-03-08 14:20:42 -0800 |
|---|---|---|
| committer | Matt Kwong <mattkwong@google.com> | 2017-03-08 14:20:42 -0800 |
| commit | b97e82b179fa1aeb077cf0575a982866afe17203 (patch) | |
| tree | 509fa160f592e80af5f93d5d3f9bf49bd6c6432e | |
| parent | 8809afd0abdbbc83d45d225955dff064903334cf (diff) | |
Change Kokoro scripts to use run_tests_matrix.py
| -rw-r--r-- | tools/internal_ci/linux/grpc_master_sanitizers.sh | 10 | ||||
| -rw-r--r-- | tools/internal_ci/linux/grpc_portability.sh | 11 | ||||
| -rw-r--r-- | tools/internal_ci/linux/grpc_portability_build_only.sh | 2 |
3 files changed, 3 insertions, 20 deletions
diff --git a/tools/internal_ci/linux/grpc_master_sanitizers.sh b/tools/internal_ci/linux/grpc_master_sanitizers.sh index b174c9b174..2cd0efe158 100644 --- a/tools/internal_ci/linux/grpc_master_sanitizers.sh +++ b/tools/internal_ci/linux/grpc_master_sanitizers.sh @@ -37,12 +37,4 @@ git submodule update --init # download docker images from dockerhub export DOCKERHUB_ORGANIZATION=grpctesting -tools/jenkins/run_jenkins_matrix.sh -f sanitizers linux - -# 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.sh -f sanitizers linux diff --git a/tools/internal_ci/linux/grpc_portability.sh b/tools/internal_ci/linux/grpc_portability.sh index a7460e5a50..c7ac3bbcbe 100644 --- a/tools/internal_ci/linux/grpc_portability.sh +++ b/tools/internal_ci/linux/grpc_portability.sh @@ -37,13 +37,4 @@ git submodule update --init # download docker images from dockerhub export DOCKERHUB_ORGANIZATION=grpctesting -tools/jenkins/run_jenkins_matrix.sh -f portability linux - -# 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.sh -f portability linux diff --git a/tools/internal_ci/linux/grpc_portability_build_only.sh b/tools/internal_ci/linux/grpc_portability_build_only.sh index 92678c15f8..edd6f91687 100644 --- a/tools/internal_ci/linux/grpc_portability_build_only.sh +++ b/tools/internal_ci/linux/grpc_portability_build_only.sh @@ -37,4 +37,4 @@ git submodule update --init # download docker images from dockerhub export DOCKERHUB_ORGANIZATION=grpctesting -tools/jenkins/run_jenkins_matrix.sh -f portability linux --build_only +tools/run_tests/run_tests_matrix.sh -f portability linux --build_only |