1 files changed, 31 insertions, 9 deletions
diff --git a/test/cpp/qps/gen_build_yaml.py b/test/cpp/qps/gen_build_yaml.py
index a3ccbcf576..bd40d0a5a2 100755
--- a/test/cpp/qps/gen_build_yaml.py
+++ b/test/cpp/qps/gen_build_yaml.py
@@ -77,28 +77,50 @@ print yaml.dump({
       'defaults': 'boringssl',
       'cpu_cost': guess_cpu(scenario_json, False),
       'exclude_configs': ['tsan', 'asan'],
-      'timeout_seconds': 6*60,
-      'excluded_poll_engines': scenario_json.get('EXCLUDED_POLL_ENGINES', [])
+      'timeout_seconds': 2*60,
+      'excluded_poll_engines': scenario_json.get('EXCLUDED_POLL_ENGINES', []),
+      'auto_timeout_scaling': False
     }
     for scenario_json in scenario_config.CXXLanguage().scenarios()
     if 'scalable' in scenario_json.get('CATEGORIES', [])
   ] + [
     {
-      'name': 'json_run_localhost',
-      'shortname': 'json_run_localhost:%s_low_thread_count' % scenario_json['name'],
-      'args': ['--scenarios_json', _scenario_json_string(scenario_json, True)],
+      'name': 'qps_json_driver',
+      'shortname': 'qps_json_driver:inproc_%s' % scenario_json['name'],
+      'args': ['--run_inproc', '--scenarios_json', _scenario_json_string(scenario_json, False)],
       'ci_platforms': ['linux'],
       'platforms': ['linux'],
       'flaky': False,
       'language': 'c++',
       'boringssl': True,
       'defaults': 'boringssl',
-      'cpu_cost': guess_cpu(scenario_json, True),
-      'exclude_configs': sorted(c for c in configs_from_yaml if c not in ('tsan', 'asan')),
+      'cpu_cost': guess_cpu(scenario_json, False),
+      'exclude_configs': ['tsan', 'asan'],
       'timeout_seconds': 6*60,
       'excluded_poll_engines': scenario_json.get('EXCLUDED_POLL_ENGINES', [])
-   }
+    }
     for scenario_json in scenario_config.CXXLanguage().scenarios()
-    if 'scalable' in scenario_json.get('CATEGORIES', [])
+    if 'inproc' in scenario_json.get('CATEGORIES', [])
   ]
+  # Disabled until https://github.com/grpc/grpc/issues/13122 is resolved.
+  # + [
+  #   {
+  #     'name': 'json_run_localhost',
+  #     'shortname': 'json_run_localhost:%s_low_thread_count' % scenario_json['name'],
+  #     'args': ['--scenarios_json', _scenario_json_string(scenario_json, True)],
+  #     'ci_platforms': ['linux'],
+  #     'platforms': ['linux'],
+  #     'flaky': False,
+  #     'language': 'c++',
+  #     'boringssl': True,
+  #     'defaults': 'boringssl',
+  #     'cpu_cost': guess_cpu(scenario_json, True),
+  #     'exclude_configs': sorted(c for c in configs_from_yaml if c not in ('tsan', 'asan')),
+  #     'timeout_seconds': 10*60,
+  #     'excluded_poll_engines': scenario_json.get('EXCLUDED_POLL_ENGINES', []),
+  #     'auto_timeout_scaling': False
+  #  }
+  #   for scenario_json in scenario_config.CXXLanguage().scenarios()
+  #   if 'scalable' in scenario_json.get('CATEGORIES', [])
+  # ]
 })