| Index: masters/master.tryserver.chromium.win/slaves.cfg
|
| diff --git a/masters/master.tryserver.chromium.win/slaves.cfg b/masters/master.tryserver.chromium.win/slaves.cfg
|
| index 99bc65b6ad03f76c36467164c1b593e386e15edd..cacf0607eeaeb101fcf16affa8726e7b8e9fdd65 100644
|
| --- a/masters/master.tryserver.chromium.win/slaves.cfg
|
| +++ b/masters/master.tryserver.chromium.win/slaves.cfg
|
| @@ -4,8 +4,9 @@
|
| # Use of this source code is governed by a BSD-style license that can be
|
| # found in the LICENSE file.
|
|
|
| -def distribute_slaves(slave_numbers, builders, os_ver, pool=None, gce=False):
|
| - hostname_format = 'vm%d-m4' if not gce else 'slave%d-c4'
|
| +def distribute_slaves(slave_numbers, builders, os_ver, pool=None, gce=False,
|
| + prefix='vm'):
|
| + hostname_format = prefix + '%d-m4' if not gce else 'slave%d-c4'
|
| return [
|
| {
|
| 'master': 'TryServerChromiumWin',
|
| @@ -57,6 +58,8 @@ def windows():
|
| optional_slaves_gn, optional_builders_gn, 'win7', 'win_optional_gn')
|
|
|
| optional_slaves_chromium = [181, 185, 186, 187, 192]
|
| + optional_highend_slaves_chromium = [533]
|
| +
|
| optional_builders_chromium = [
|
| # directory: win
|
| 'win_chromium_compile_rel_ng',
|
| @@ -78,7 +81,6 @@ def windows():
|
| # directory: win_webkit
|
| 'win_chromium_variable_webkit_builder',
|
| 'win_chromium_variable_webkit_win7_builder',
|
| - 'win_chromium_variable_webkit_win7_builder_x64',
|
| # directory: win_nacl_sdk
|
| 'win_nacl_sdk',
|
| # directory: win_nacl_sdk_build
|
| @@ -86,13 +88,28 @@ def windows():
|
| # directory: win_x64
|
| 'win_x64_chromium_variable_builder',
|
| ]
|
| +
|
| + # Experimental optional builders on high-end machines.
|
| + optional_builders_chromium_highend = [
|
| + # directory: win_webkit
|
| + 'win_chromium_variable_webkit_win7_builder_x64',
|
| + ]
|
| +
|
| optional_pool_chromium = distribute_slaves(
|
| optional_slaves_chromium,
|
| optional_builders_chromium,
|
| 'win7',
|
| 'win_optional_chromium')
|
|
|
| - optional_pool = optional_pool_chromium + optional_pool_gn
|
| + optional_highend_pool_chromium = distribute_slaves(
|
| + optional_highend_slaves_chromium,
|
| + optional_builders_chromium_highend,
|
| + 'win7',
|
| + 'win_optional_highend',
|
| + prefix='build')
|
| +
|
| + optional_pool = (optional_pool_chromium + optional_highend_pool_chromium +
|
| + optional_pool_gn)
|
|
|
| win8_slaves = ([115, 168, 722, 798, 799] + range(384, 399) +
|
| range(408, 422) + range(468, 495) +
|
|
|