| Index: scripts/slave/recipe_modules/chromium_tests/tryserver_chromium_perf.py
|
| diff --git a/scripts/slave/recipe_modules/chromium_tests/tryserver_chromium_perf.py b/scripts/slave/recipe_modules/chromium_tests/tryserver_chromium_perf.py
|
| index f25d9111a2077ff8b9bf63bcd36f9c82d097e440..724895b078072f1640d9955cef9ee41930a2f0ba 100644
|
| --- a/scripts/slave/recipe_modules/chromium_tests/tryserver_chromium_perf.py
|
| +++ b/scripts/slave/recipe_modules/chromium_tests/tryserver_chromium_perf.py
|
| @@ -2,61 +2,50 @@
|
| # Use of this source code is governed by a BSD-style license that can be
|
| # found in the LICENSE file.
|
|
|
| +import copy
|
|
|
| from . import chromium_perf
|
| from . import steps
|
|
|
|
|
| +def _Builders():
|
| + # These should build with the same configs as the main perf builders.
|
| + builders = {}
|
| + for bisect_bot_name, perf_bot_name in _PERF_BOT_MAPPINGS.iteritems():
|
| + config = copy.deepcopy(chromium_perf.SPEC['builders'][perf_bot_name])
|
| + del config['tests'] # Don't run the same tests as the perf waterfall.
|
| + builders[bisect_bot_name] = config
|
| + return builders
|
| +
|
| +
|
| +_PERF_BOT_MAPPINGS = {
|
| + 'linux_perf_bisect_builder': 'Linux Builder',
|
| + 'linux_perf_bisect': 'Linux Builder',
|
| + 'linux_perf_cq': 'Linux Builder',
|
| + 'linux_fyi_perf_bisect': 'Linux Builder',
|
| + 'win_perf_bisect_builder': 'Win Builder',
|
| + 'win_perf_bisect': 'Win Builder',
|
| + 'win_8_perf_bisect': 'Win Builder',
|
| + 'winx64_10_perf_bisect': 'Win x64 Builder',
|
| + 'winx64_bisect_builder': 'Win x64 Builder',
|
| + 'win_x64_perf_bisect': 'Win x64 Builder',
|
| + 'winx64ati_perf_bisect': 'Win x64 Builder',
|
| + 'winx64nvidia_perf_bisect': 'Win x64 Builder',
|
| + 'winx64intel_perf_bisect': 'Win x64 Builder',
|
| + 'winx64_zen_perf_bisect': 'Win x64 Builder',
|
| + 'winx64_10_perf_cq': 'Win x64 Builder',
|
| + 'win_fyi_perf_bisect': 'Win Builder',
|
| + 'mac_perf_bisect_builder': 'Mac Builder',
|
| + 'mac_10_11_perf_bisect': 'Mac Builder',
|
| + 'mac_10_10_perf_bisect': 'Mac Builder',
|
| + 'mac_retina_perf_bisect': 'Mac Builder',
|
| + 'mac_hdd_perf_bisect': 'Mac Builder',
|
| + 'mac_retina_perf_cq': 'Mac Builder',
|
| + 'mac_fyi_perf_bisect': 'Mac Builder',
|
| +}
|
| +
|
| +
|
| SPEC = {
|
| 'settings': chromium_perf.SPEC['settings'],
|
| - 'builders': {
|
| - # This is intended to build in the same way as the main perf builder.
|
| - 'linux_perf_bisect_builder':
|
| - chromium_perf.SPEC['builders']['Linux Builder'],
|
| - 'linux_perf_bisect':
|
| - chromium_perf.SPEC['builders']['Linux Builder'],
|
| - 'linux_perf_cq':
|
| - chromium_perf.SPEC['builders']['Linux Builder'],
|
| - 'linux_fyi_perf_bisect':
|
| - chromium_perf.SPEC['builders']['Linux Builder'],
|
| - 'win_perf_bisect_builder':
|
| - chromium_perf.SPEC['builders']['Win Builder'],
|
| - 'win_perf_bisect':
|
| - chromium_perf.SPEC['builders']['Win Builder'],
|
| - 'win_8_perf_bisect':
|
| - chromium_perf.SPEC['builders']['Win Builder'],
|
| - 'winx64_10_perf_bisect':
|
| - chromium_perf.SPEC['builders']['Win x64 Builder'],
|
| - 'winx64_bisect_builder':
|
| - chromium_perf.SPEC['builders']['Win x64 Builder'],
|
| - 'win_x64_perf_bisect':
|
| - chromium_perf.SPEC['builders']['Win x64 Builder'],
|
| - 'winx64ati_perf_bisect':
|
| - chromium_perf.SPEC['builders']['Win x64 Builder'],
|
| - 'winx64nvidia_perf_bisect':
|
| - chromium_perf.SPEC['builders']['Win x64 Builder'],
|
| - 'winx64intel_perf_bisect':
|
| - chromium_perf.SPEC['builders']['Win x64 Builder'],
|
| - 'winx64_zen_perf_bisect':
|
| - chromium_perf.SPEC['builders']['Win x64 Builder'],
|
| - 'winx64_10_perf_cq':
|
| - chromium_perf.SPEC['builders']['Win x64 Builder'],
|
| - 'win_fyi_perf_bisect':
|
| - chromium_perf.SPEC['builders']['Win Builder'],
|
| - 'mac_perf_bisect_builder':
|
| - chromium_perf.SPEC['builders']['Mac Builder'],
|
| - 'mac_10_11_perf_bisect':
|
| - chromium_perf.SPEC['builders']['Mac Builder'],
|
| - 'mac_10_10_perf_bisect':
|
| - chromium_perf.SPEC['builders']['Mac Builder'],
|
| - 'mac_retina_perf_bisect':
|
| - chromium_perf.SPEC['builders']['Mac Builder'],
|
| - 'mac_hdd_perf_bisect':
|
| - chromium_perf.SPEC['builders']['Mac Builder'],
|
| - 'mac_retina_perf_cq':
|
| - chromium_perf.SPEC['builders']['Mac Builder'],
|
| - 'mac_fyi_perf_bisect':
|
| - chromium_perf.SPEC['builders']['Mac Builder'],
|
| - }
|
| + 'builders': _Builders(),
|
| }
|
| -
|
|
|