1 files changed, 16 insertions, 3 deletions
diff --git a/tools/run_tests/python_utils/upload_rbe_results.py b/tools/run_tests/python_utils/upload_rbe_results.py
index d29ebc6219..3f3bd382bb 100644
--- a/tools/run_tests/python_utils/upload_rbe_results.py
+++ b/tools/run_tests/python_utils/upload_rbe_results.py
@@ -40,13 +40,14 @@ _RESULTS_SCHEMA = [
     ('test_case', 'STRING', 'Name of test case'),
     ('result', 'STRING', 'Test or build result'),
     ('timestamp', 'TIMESTAMP', 'Timestamp of test run'),
+    ('duration', 'FLOAT', 'Duration of the test run'),
 ]
 _TABLE_ID = 'rbe_test_results'
 
 
 def _get_api_key():
     """Returns string with API key to access ResultStore.
-	Intended to be used in Kokoro envrionment."""
+	Intended to be used in Kokoro environment."""
     api_key_directory = os.getenv('KOKORO_GFILE_DIR')
     api_key_file = os.path.join(api_key_directory, 'resultstore_api_key')
     assert os.path.isfile(api_key_file), 'Must add --api_key arg if not on ' \
@@ -57,15 +58,25 @@ def _get_api_key():
 
 def _get_invocation_id():
     """Returns String of Bazel invocation ID. Intended to be used in
-	Kokoro envirionment."""
+	Kokoro environment."""
     bazel_id_directory = os.getenv('KOKORO_ARTIFACTS_DIR')
     bazel_id_file = os.path.join(bazel_id_directory, 'bazel_invocation_ids')
     assert os.path.isfile(bazel_id_file), 'bazel_invocation_ids file, written ' \
-     'by bazel_wrapper.py, expected but not found.'
+     'by RBE initialization script, expected but not found.'
     with open(bazel_id_file, 'r') as f:
         return f.read().replace('\n', '')
 
 
+def _parse_test_duration(duration_str):
+    """Parse test duration string in '123.567s' format"""
+    try:
+        if duration_str.endswith('s'):
+            duration_str = duration_str[:-1]
+        return float(duration_str)
+    except:
+        return None
+
+
 def _upload_results_to_bq(rows):
     """Upload test results to a BQ table.
 
@@ -205,6 +216,8 @@ if __name__ == "__main__":
                         result,
                         'timestamp':
                         action['timing']['startTime'],
+                        'duration':
+                        _parse_test_duration(action['timing']['duration']),
                     }
                 })
             except Exception as e: