slave_hosts_cfg: Use new Windows GCE instances, use fewer, 16-core GCE instances

master/slaves.cfg

Index: master/slaves.cfg
diff --git a/master/slaves.cfg b/master/slaves.cfg
index 0a3d2ac303ea7438a8b1a2f243665b5367473a73..3d4a63259284e5ec5e6e30974290cb5c63ade63b 100644
--- a/master/slaves.cfg
+++ b/master/slaves.cfg
@@ -8,15 +8,16 @@
 # See master.experimental/slaves.cfg for documentation.
 
 
-LINUX_CANARY_BUILDSLAVES = range(1, 16)
-LINUX_COMPILE_BUILDSLAVES = range(1, 51)
-LINUX_TEST_BUILDSLAVES = range(10)
+LINUX_CANARY_BUILDSLAVES = range(3)
+LINUX_COMPILE_BUILDSLAVES = range(13)
+LINUX_TEST_BUILDSLAVES = range(4)
+LINUX_XSAN_BUILDSLAVES = range(2)
 
 INTEGER_WIDTH = 3
 DEFAULT_CONCURRENT_BUILDSLAVES = range(4)
 DEFAULT_COMPILE_BUILDSLAVES = range(10)
-WIN7_COMPILE_BUILDSLAVES = (0, 4)
-WIN7_GCE_COMPILE_BUILDSLAVES = range(10)
+WIN_COMPILE_BUILDSLAVES = range(4)
+WIN_CANARY_BUILDSLAVES = range(3)
 WIN8_COMPILE_BUILDSLAVES = range(2)
 ANDROID_KEEPALIVE_CONDITION = ['python',
     'buildbot/slave/skia_slave_scripts/android_verify_device.py', '--serial',
@@ -60,16 +61,16 @@ LINUX_COMPILE_BUILDERS = [
   'Build-Ubuntu13.10-GCC4.8-Arm7-Release-CrOS_Daisy',
   'Build-Ubuntu13.10-Clang-x86_64-Debug',
 ]
-WIN7_COMPILE_BUILDERS = [
-  'Build-Win7-VS2010-x86-Debug',
-  'Build-Win7-VS2010-x86-Release',
-  'Build-Win7-VS2010-x86_64-Debug',
-  'Build-Win7-VS2010-x86_64-Release',
-  'Build-Win7-VS2010-x86-Debug-ANGLE',
-  'Build-Win7-VS2010-x86-Release-ANGLE',
-  'Build-Win7-VS2010-x86-Debug-DirectWrite',
-  'Build-Win7-VS2010-x86-Release-DirectWrite',
-  'Build-Win7-VS2010-x86-Debug-Exceptions',
+WIN_COMPILE_BUILDERS = [
+  'Build-Win-VS2013-x86-Debug',
+  'Build-Win-VS2013-x86-Release',
+  'Build-Win-VS2013-x86_64-Debug',
+  'Build-Win-VS2013-x86_64-Release',
+  'Build-Win-VS2013-x86-Debug-ANGLE',
+  'Build-Win-VS2013-x86-Release-ANGLE',
+  'Build-Win-VS2013-x86-Debug-DirectWrite',
+  'Build-Win-VS2013-x86-Release-DirectWrite',
+  'Build-Win-VS2013-x86-Debug-Exceptions',
 ]
 
 
@@ -310,19 +311,12 @@ slaves = [SelfReferenceFormat(d) for d in [
 ] + [
   {
     'master': 'Skia',
-    'hostname': 'skiabot-linux-sanitizer-%s-A' % ('%d' % i).zfill(INTEGER_WIDTH),
+    'hostname': 'skiabot-linux-xsan-%s' % ('%d' % i).zfill(INTEGER_WIDTH),
     'builder': [
         'Test-Ubuntu13.10-GCE-NoGPU-x86_64-Debug-ASAN',
-        ],
-  } for i in xrange(4)
-] + [
-  {
-    'master': 'Skia',
-    'hostname': 'skiabot-linux-sanitizer-%s-T' % ('%d' % i).zfill(INTEGER_WIDTH),
-    'builder': [
         'Test-Ubuntu13.10-GCE-NoGPU-x86_64-Release-TSAN',
         ],
-  } for i in xrange(4)
+  } for i in LINUX_XSAN_BUILDSLAVES
 ] + [
   {
     'master': 'Skia',
@@ -406,13 +400,15 @@ slaves = [SelfReferenceFormat(d) for d in [
         'Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite',
         ],
   },
+] + [
   {
     'master': 'Skia',
-    'hostname': 'skiabot-win-canary-001',
+    'hostname': 'skiabot-win-canary-%s' % ('%d' % i).zfill(INTEGER_WIDTH),
     'builder': [
-        'Canary-Chrome-Win7-Ninja-x86-SharedLib_ToT',
+        'Canary-Chrome-Win-Ninja-x86-SharedLib_ToT',
         ],
-  },
+  } for i in WIN_CANARY_BUILDSLAVES
+] + [
   {
     'master': 'Skia',
     'hostname': 'skiabot-shuttle-win8-gtx660-000',
@@ -545,26 +541,9 @@ slaves = [SelfReferenceFormat(d) for d in [
 ] + [
   {
     'master': 'CompileSkia',
-    'hostname': 'skiabot-win-vm-%s' % ('%d' % i).zfill(INTEGER_WIDTH),
-    'builder': WIN7_COMPILE_BUILDERS,
-  } for i in WIN7_GCE_COMPILE_BUILDSLAVES
-] + [
-  {
-    'master': 'CompileSkia',
     'hostname': 'skiabot-win-compile-%s' % ('%d' % i).zfill(INTEGER_WIDTH),
-    'builder': WIN7_COMPILE_BUILDERS,
-  } for i in WIN7_COMPILE_BUILDSLAVES
-] + [
-  {
-    'master': 'CompileSkia',
-    'hostname': 'skiabot-win8-compile-%s' % ('%d' % i).zfill(INTEGER_WIDTH),
-    'builder': [
-        'Build-Win8-VS2012-x86-Debug',
-        'Build-Win8-VS2012-x86-Release',
-        'Build-Win8-VS2012-x86_64-Debug',
-        'Build-Win8-VS2012-x86_64-Release',
-        ],
-  } for i in WIN8_COMPILE_BUILDSLAVES
+    'builder': WIN_COMPILE_BUILDERS,
+  } for i in WIN_COMPILE_BUILDSLAVES
 ] + [
 ################################################################################
 ############################ Private Buildslaves ###############################
@@ -596,7 +575,7 @@ slaves = [SelfReferenceFormat(d) for d in [
 
   {
     'master': 'FYISkia',
-    'hostname': 'skiabot-shuttle-ubuntu12-006',
+    'hostname': 'skiabot-linux-vm-000',
     'builder': [
         'Canary-Moz2D-Ubuntu12-GCC-x86_64-Release',
         ],
@@ -612,7 +591,7 @@ slaves = [SelfReferenceFormat(d) for d in [
 
   {
     'master': 'FYISkia',
-    'hostname': 'skia-recreate-skps',
+    'hostname': 'skiabot-linux-vm-001',
     'builder': [
         'Housekeeper-Nightly-RecreateSKPs',
         ],
@@ -620,7 +599,7 @@ slaves = [SelfReferenceFormat(d) for d in [
 
   {
     'master': 'FYISkia',
-    'hostname': 'skiabot-linux-vm-001',
+    'hostname': 'skiabot-linux-vm-002',
     'builder': [
         'Test-Linux-Bare-NoGPU-Arm64-Debug',
         ],
@@ -631,7 +610,7 @@ slaves = [SelfReferenceFormat(d) for d in [
 
   {
     'master': 'FYISkia',
-    'hostname': 'skiabot-linux-vm-002',
+    'hostname': 'skiabot-linux-vm-003',
     'builder': [
         'Housekeeper-PerCommit-AutoRoll',
         ],
@@ -649,6 +628,6 @@ cq_trybots = [
   'Build-Ubuntu13.10-Clang-x86_64-Debug-Trybot',
   'Build-Ubuntu13.10-GCC4.8-x86_64-Release-Trybot',
   'Build-Ubuntu13.10-GCC4.8-Arm7-Debug-Android-Trybot',
-  'Build-Win7-VS2010-x86-Debug-Trybot',
+  'Build-Win-VS2013-x86-Debug-Trybot',
   'Test-Ubuntu13.10-ShuttleA-NoGPU-x86_64-Debug-Trybot',
 ]