diff options
author | 2016-09-28 13:21:31 -0700 | |
---|---|---|
committer | 2016-09-28 13:21:31 -0700 | |
commit | 5db24978b6a710ebb38de9c006180a754e14a184 (patch) | |
tree | db7b7cabcea181deef349cfa7491d17b5a186c6d /test/cpp | |
parent | e8b87865b268856d5510abb6ffd044224c079c13 (diff) | |
parent | b97f867b390193daf18988958183143726602727 (diff) |
Merge remote-tracking branch 'upstream/master' into fail_fast
Diffstat (limited to 'test/cpp')
-rwxr-xr-x | test/cpp/qps/gen_build_yaml.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/cpp/qps/gen_build_yaml.py b/test/cpp/qps/gen_build_yaml.py index 4ff4e44b8b..369da2c8ca 100755 --- a/test/cpp/qps/gen_build_yaml.py +++ b/test/cpp/qps/gen_build_yaml.py @@ -74,8 +74,8 @@ print yaml.dump({ 'name': 'json_run_localhost', 'shortname': 'json_run_localhost:%s' % scenario_json['name'], 'args': ['--scenarios_json', _scenario_json_string(scenario_json)], - 'ci_platforms': ['linux', 'mac', 'posix', 'windows'], - 'platforms': ['linux', 'mac', 'posix', 'windows'], + 'ci_platforms': ['linux'], + 'platforms': ['linux'], 'flaky': False, 'language': 'c++', 'boringssl': True, @@ -85,5 +85,6 @@ print yaml.dump({ 'timeout_seconds': 3*60 } for scenario_json in scenario_config.CXXLanguage().scenarios() + if 'scalable' in scenario_json.get('CATEGORIES', []) ] }) |