Moving Findit variable builder to experimental high-end bot

masters/master.tryserver.chromium.win/slaves.cfg

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..487e4ab29965664ac2f5f05aa25946506ec73e00 100644
--- a/masters/master.tryserver.chromium.win/slaves.cfg
+++ b/masters/master.tryserver.chromium.win/slaves.cfg
@@ -4,8 +4,13 @@
 # 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,
+                      build=False):

[Sergey Berezin, 2016/07/26 00:14:44]

nit: this may be better served by prefix='vm', and just specifying the correct
prefix at the call site.

In fact, gce is not used it this file (we don't have GCE windows bots). So
another option is to remove gce and just keep build.

[lijeffrey, 2016/07/26 01:17:00]

Cool. I'll go with the prefix='vm' route in case we add GCE support in the
future

+  if build:
+    hostname_format = 'build%d-m4'
+  else:
+    hostname_format = 'vm%d-m4' if not gce else 'slave%d-c4'
+
   return [
     {
       'master': 'TryServerChromiumWin',
@@ -57,6 +62,8 @@ def windows():
       optional_slaves_gn, optional_builders_gn, 'win7', 'win_optional_gn')
 
   optional_slaves_chromium = [181, 185, 186, 187, 192]
+  optional_high_end_slaves_chromium = [533]
+
   optional_builders_chromium = [
     # directory: win
     'win_chromium_compile_rel_ng',
@@ -78,7 +85,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 +92,28 @@ def windows():
     # directory: win_x64
     'win_x64_chromium_variable_builder',
   ]
+
+  # Experimental optional builders on high-end machines.
+  optional_builders_chromium_2 = [
+    # 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_high_end_pool_chromium = distribute_slaves(
+      optional_high_end_slaves_chromium,
+      optional_builders_chromium_2,
+      'win7',
+      'win_optional_chromium',

[Sergey Berezin, 2016/07/26 00:14:44]

Please create a unique pool name, e.g. 'win_optional_highend'

[lijeffrey, 2016/07/26 01:17:00]

Done.

+      build=True)
+
+  optional_pool = (optional_pool_chromium + optional_high_end_pool_chromium +
+      optional_pool_gn)
 
   win8_slaves = ([115, 168, 722, 798, 799] + range(384, 399) +
       range(408, 422) + range(468, 495) +