aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/interop_matrix/client_matrix.py3
-rw-r--r--tools/run_tests/python_utils/upload_rbe_results.py12
-rwxr-xr-xtools/run_tests/sanity/check_submodules.sh2
3 files changed, 15 insertions, 2 deletions
diff --git a/tools/interop_matrix/client_matrix.py b/tools/interop_matrix/client_matrix.py
index e39fabec9c..e9bc6da36b 100644
--- a/tools/interop_matrix/client_matrix.py
+++ b/tools/interop_matrix/client_matrix.py
@@ -125,6 +125,9 @@ LANG_RELEASE_MATRIX = {
{
'v1.11.3': None
},
+ {
+ 'v1.12.0': None
+ },
],
'java': [
{
diff --git a/tools/run_tests/python_utils/upload_rbe_results.py b/tools/run_tests/python_utils/upload_rbe_results.py
index d302024883..5955b3792f 100644
--- a/tools/run_tests/python_utils/upload_rbe_results.py
+++ b/tools/run_tests/python_utils/upload_rbe_results.py
@@ -146,7 +146,15 @@ if __name__ == "__main__":
test_cases = [{
'testCase': {
'caseName': str(action['id']['actionId']),
- 'result': str(action['statusAttributes']['status'])
+ }
+ }]
+ # Test timeouts have a different dictionary structure compared to pass and
+ # fail results.
+ elif action['statusAttributes']['status'] == 'TIMED_OUT':
+ test_cases = [{
+ 'testCase': {
+ 'caseName': str(action['id']['actionId']),
+ 'timedOut': True
}
}]
else:
@@ -155,6 +163,8 @@ if __name__ == "__main__":
for test_case in test_cases:
if 'errors' in test_case['testCase']:
result = 'FAILED'
+ elif 'timedOut' in test_case['testCase']:
+ result = 'TIMEOUT'
else:
result = 'PASSED'
bq_rows.append({
diff --git a/tools/run_tests/sanity/check_submodules.sh b/tools/run_tests/sanity/check_submodules.sh
index 723d18565d..58041365b1 100755
--- a/tools/run_tests/sanity/check_submodules.sh
+++ b/tools/run_tests/sanity/check_submodules.sh
@@ -28,7 +28,7 @@ git submodule | awk '{ print $1 }' | sort > "$submodules"
cat << EOF | awk '{ print $1 }' | sort > "$want_submodules"
5b7683f49e1e9223cf9927b24f6fd3d6bd82e3f8 third_party/benchmark (v1.2.0)
a20bb7ff8bb5057065a2e7941249773f9676cf45 third_party/boringssl (heads/chromium-stable)
- 886e7d75368e3f4fab3f4d0d3584e4abfc557755 third_party/boringssl-with-bazel (version_for_cocoapods_7.0-857-g886e7d7)
+ dcd3e6e6ecddf059adb48fca45bc7346a108bdd9 third_party/boringssl-with-bazel (version_for_cocoapods_10.0-369-gdcd3e6e6)
30dbc81fb5ffdc98ea9b14b1918bfe4e8779b26e third_party/gflags (v2.2.0)
ec44c6c1675c25b9827aacd08c02433cccde7780 third_party/googletest (release-1.8.0)
b5fbb742af122b565925987e65c08957739976a7 third_party/protobuf (v3.5.2)