diff options
Diffstat (limited to 'tools')
| -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 | ||||
| -rw-r--r-- | tools/interop_matrix/client_matrix.py | 35 |
4 files changed, 26 insertions, 22 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 diff --git a/tools/interop_matrix/client_matrix.py b/tools/interop_matrix/client_matrix.py index 2fe45d5573..22e522bf6e 100644 --- a/tools/interop_matrix/client_matrix.py +++ b/tools/interop_matrix/client_matrix.py @@ -85,10 +85,13 @@ LANG_RELEASE_MATRIX = { 'v1.9.1': None }, { - 'v1.10.0': None + 'v1.10.1': None }, { - 'v1.11.0': None + 'v1.11.1': None + }, + { + 'v1.12.0': None }, ], 'go': [ @@ -199,10 +202,13 @@ LANG_RELEASE_MATRIX = { 'v1.9.1': None }, { - 'v1.10.0': None + 'v1.10.1': None }, { - 'v1.11.0': None + 'v1.11.1': None + }, + { + 'v1.12.0': None }, ], 'node': [ @@ -272,10 +278,13 @@ LANG_RELEASE_MATRIX = { 'v1.9.1': None }, { - 'v1.10.0': None + 'v1.10.1': None }, { - 'v1.11.0': None + 'v1.11.1': None + }, + { + 'v1.12.0': None }, ], 'php': [ @@ -307,10 +316,13 @@ LANG_RELEASE_MATRIX = { 'v1.9.1': None }, { - 'v1.10.0': None + 'v1.10.1': None }, { - 'v1.11.0': None + 'v1.11.1': None + }, + { + 'v1.12.0': None }, ], 'csharp': [ @@ -340,10 +352,13 @@ LANG_RELEASE_MATRIX = { 'v1.9.1': None }, { - 'v1.10.0': None + 'v1.10.1': None }, { - 'v1.11.0': None + 'v1.11.1': None + }, + { + 'v1.12.0': None }, ], } |