Fix saving results to BigQuery from Kokoro in OSS benchmarks. (#26049)

tools/internal_ci/linux/grpc_e2e_performance_v2.sh

@@ -34,7 +34,7 @@ gcloud container clusters get-credentials benchmarks-prod \
 tools/run_tests/performance/loadtest_config.py -l go \
     -t ./tools/run_tests/performance/templates/loadtest_template_basic_all_languages.yaml \
     -s client_pool=workers-8core -s server_pool=workers-8core \
-    -s big_query_table=grpc-testing.e2e_benchmarks.experimental_results \
+    -s big_query_table=e2e_benchmarks.experimental_results \
     -s timeout_seconds=900 --prefix="kokoro-test" -u "$(date +%Y%m%d%H%M%S)" \
     -r go_generic_sync_streaming_ping_pong_secure -o ./loadtest.yaml
 

tools/run_tests/performance/README.md

@@ -356,8 +356,8 @@ The script `loadest_template.py` takes the following options:
   clients in `spec.clients` is set to `${client_pool}`, for later substitution.
 - `--inject_server_pool`<br> If this option is set, the pool attribute of all
   servers in `spec.servers` is set to `${server_pool}`, for later substitution.
-- `--inject_big_query_table`<br> If this option is set, spec.bigQueryTable is
-  set to `${big_query_table}`.
+- `--inject_big_query_table`<br> If this option is set,
+  spec.results.bigQueryTable is set to `${big_query_table}`.
 - `--inject_timeout_seconds`<br> If this option is set, `spec.timeoutSeconds` is
   set to `${timeout_seconds}`.
 - `--inject_ttl_seconds`<br> If this option is set, `spec.ttlSeconds` is set to

tools/run_tests/performance/loadtest_template.py

@@ -109,7 +109,9 @@ def loadtest_template(
     })
 
     if inject_big_query_table:
-        spec['big_query_table'] = '${big_query_table}'
+        if 'results' not in spec:
+            spec['results'] = dict()
+        spec['results']['bigQueryTable'] = '${big_query_table}'
     if inject_timeout_seconds:
         spec['timeoutSeconds'] = '${timeout_seconds}'
     if inject_ttl_seconds:
@@ -156,9 +158,10 @@ def main() -> None:
         '--inject_server_pool',
         action='store_true',
         help='Set spec.server(s).pool values to \'${server_pool}\'.')
-    argp.add_argument('--inject_big_query_table',
-                      action='store_true',
-                      help='Set spec.bigQueryTable to \'${big_query_table}\'.')
+    argp.add_argument(
+        '--inject_big_query_table',
+        action='store_true',
+        help='Set spec.results.bigQueryTable to \'${big_query_table}\'.')
     argp.add_argument('--inject_timeout_seconds',
                       action='store_true',
                       help='Set spec.timeoutSeconds to \'${timeout_seconds}\'.')

tools/run_tests/performance/templates/loadtest_template_basic_all_languages.yaml

@@ -13,7 +13,6 @@ kind: LoadTest
 metadata:
   name: basic_all_languages
 spec:
-  big_query_table: ${big_query_table}
   clients:
   - build:
       command:
@@ -133,6 +132,8 @@ spec:
       - src/ruby/qps/worker.rb
       command:
       - ruby
+  results:
+    bigQueryTable: ${big_query_table}
   servers:
   - build:
       command: