Merge pull request #15518 from jtattermusch/run_tests_cleanup

A small cleanup in internal_ci scripts
pull/15524/head
Jan Tattermusch 7 years ago committed by GitHub
commit b7079d41d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      tools/internal_ci/helper_scripts/delete_nonartifacts.sh
  2. 3
      tools/internal_ci/linux/grpc_run_tests_matrix.sh
  3. 8
      tools/internal_ci/macos/grpc_run_tests_matrix.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 {} +
time find . -type f -not -iname "*sponge_log.xml" -not -path "./reports/*" -not -path "./artifacts/*" -not -path "./tools/internal_ci/*" -exec rm -f {} +

@ -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" != "" ]

@ -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

Loading…
Cancel
Save