diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2018-05-22 21:47:43 -0700 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2018-05-22 21:47:43 -0700 |
| commit | 9dae9703e2da9431dbbe0ed3c7b2ba9c76feef9e (patch) | |
| tree | fb13190cdec9e8f5d53496ba404a1ab1352767dd /tools/internal_ci | |
| parent | 18ce0cf26e733647b33cbaafee57245fdfb932e7 (diff) | |
cleanup in run_tests_scripts
Diffstat (limited to 'tools/internal_ci')
| -rwxr-xr-x | tools/internal_ci/helper_scripts/delete_nonartifacts.sh | 2 | ||||
| -rwxr-xr-x | tools/internal_ci/linux/grpc_run_tests_matrix.sh | 3 | ||||
| -rwxr-xr-x | tools/internal_ci/macos/grpc_run_tests_matrix.sh | 8 |
3 files changed, 1 insertions, 12 deletions
diff --git a/tools/internal_ci/helper_scripts/delete_nonartifacts.sh b/tools/internal_ci/helper_scripts/delete_nonartifacts.sh index 6c49b7377e..c7d6ba6d44 100755 --- a/tools/internal_ci/helper_scripts/delete_nonartifacts.sh +++ b/tools/internal_ci/helper_scripts/delete_nonartifacts.sh @@ -24,4 +24,4 @@ cd "$(dirname "$0")/../../.." # after finishing each build. We only leave files we want to keep: # - reports and artifacts # - directory containing the kokoro scripts to prevent deleting a script while being executed. -time find . -type f -not -iname "*sponge_log.xml" -not -path "./reports/*" -not -path "./artifacts/*" -not -path "./tools/internal_ci/*" -exec rm -f {} +
\ No newline at end of file +time find . -type f -not -iname "*sponge_log.xml" -not -path "./reports/*" -not -path "./artifacts/*" -not -path "./tools/internal_ci/*" -exec rm -f {} + diff --git a/tools/internal_ci/linux/grpc_run_tests_matrix.sh b/tools/internal_ci/linux/grpc_run_tests_matrix.sh index 1018708f96..4e7515227b 100755 --- a/tools/internal_ci/linux/grpc_run_tests_matrix.sh +++ b/tools/internal_ci/linux/grpc_run_tests_matrix.sh @@ -29,9 +29,6 @@ fi tools/run_tests/run_tests_matrix.py $RUN_TESTS_FLAGS || FAILED="true" -# Reveal leftover processes that might be left behind by the build -ps aux | grep -i kbuilder - echo 'Exiting gRPC main test script.' if [ "$FAILED" != "" ] diff --git a/tools/internal_ci/macos/grpc_run_tests_matrix.sh b/tools/internal_ci/macos/grpc_run_tests_matrix.sh index 6e0c2bb487..9a43e4869b 100755 --- a/tools/internal_ci/macos/grpc_run_tests_matrix.sh +++ b/tools/internal_ci/macos/grpc_run_tests_matrix.sh @@ -25,14 +25,6 @@ tools/run_tests/run_tests_matrix.py $RUN_TESTS_FLAGS || FAILED="true" # kill port_server.py to prevent the build from hanging ps aux | grep port_server\\.py | awk '{print $2}' | xargs kill -9 -# Reveal leftover processes that might be left behind by the build -ps aux | grep -i kbuilder - -# TODO(jtattermusch): better debugging of clock skew, remove once not needed -date - -echo 'Exiting gRPC main test script.' - if [ "$FAILED" != "" ] then exit 1 |