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 9af27fd5a3416d0b509d0e3bbee34fe55cf7160b..01ed2cfab43a1911e68edbdbe2d0f0938f3f89f2 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(15)
+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',
@@ -302,19 +303,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',
@@ -398,13 +392,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',
         ],
-  },
+  } for i in WIN_CANARY_BUILDSLAVES
+] + [
   {
     'master': 'Skia',
     'hostname': 'skiabot-shuttle-win8-gtx660-000',
@@ -537,15 +533,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
+  } for i in WIN_COMPILE_BUILDSLAVES
 ] + [
   {
     'master': 'CompileSkia',
@@ -588,7 +578,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',
         ],
@@ -604,7 +594,7 @@ slaves = [SelfReferenceFormat(d) for d in [
 
   {
     'master': 'FYISkia',
-    'hostname': 'skia-recreate-skps',
+    'hostname': 'skiabot-linux-vm-001',
     'builder': [
         'Housekeeper-Nightly-RecreateSKPs',
         ],
@@ -612,7 +602,7 @@ slaves = [SelfReferenceFormat(d) for d in [
 
   {
     'master': 'FYISkia',
-    'hostname': 'skiabot-linux-vm-001',
+    'hostname': 'skiabot-linux-vm-002',
     'builder': [
         'Test-Linux-Bare-NoGPU-Arm8_64-Debug',
         ],
@@ -623,7 +613,7 @@ slaves = [SelfReferenceFormat(d) for d in [
 
   {
     'master': 'FYISkia',
-    'hostname': 'skiabot-linux-vm-002',
+    'hostname': 'skiabot-linux-vm-003',
     'builder': [
         'Housekeeper-PerCommit-AutoRoll',
         ],