diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-10-17 16:32:18 +0000 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-10-17 16:32:18 +0000 |
| commit | 2c75fd0f807d774bb4316530361d883dd8c4c23d (patch) | |
| tree | 5d7284780b035333e8c7a650055ef312f51e4021 /test/cpp/qps/gen_build_yaml.py | |
| parent | e5b11c26af0c847f98d83dc16134b10043ebacd5 (diff) | |
| parent | 494a778ec6baf78413ca8a7052ca93d22bd20e73 (diff) | |
Merge github.com:grpc/grpc into epexinf
Diffstat (limited to 'test/cpp/qps/gen_build_yaml.py')
| -rwxr-xr-x | test/cpp/qps/gen_build_yaml.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/test/cpp/qps/gen_build_yaml.py b/test/cpp/qps/gen_build_yaml.py index 8575fe5a05..65553f57f1 100755 --- a/test/cpp/qps/gen_build_yaml.py +++ b/test/cpp/qps/gen_build_yaml.py @@ -78,7 +78,8 @@ print yaml.dump({ 'cpu_cost': guess_cpu(scenario_json, False), 'exclude_configs': ['tsan', 'asan'], 'timeout_seconds': 2*60, - 'excluded_poll_engines': scenario_json.get('EXCLUDED_POLL_ENGINES', []) + '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', []) @@ -95,8 +96,9 @@ print yaml.dump({ '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': 2*60, - 'excluded_poll_engines': scenario_json.get('EXCLUDED_POLL_ENGINES', []) + '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', []) |