Change builder names

master/slaves.cfg

Index: master/slaves.cfg
===================================================================
--- master/slaves.cfg	(revision 8794)
+++ master/slaves.cfg	(working copy)
@@ -8,6 +8,9 @@
 # See master.experimental/slaves.cfg for documentation.
 
 
+from skia_master_scripts import utils
+
+
 INTEGER_WIDTH = 3
 CONCURRENT_BUILDERS = 8
 COMPILE_BUILDERS = 10
@@ -17,56 +20,33 @@
 DEFAULT_ANDROID_SDK_ROOT = '/home/chrome-bot/android-sdk-linux'
 DEFAULT_NACL_SDK_ROOT = '/home/chrome-bot/nacl_sdk/pepper_25'
 LINUX_COMPILE_BUILDERS = [
-  'Skia_Shuttle_Ubuntu12_ATI5770_Float_Compile_Debug_32',
-  'Skia_Shuttle_Ubuntu12_ATI5770_Float_Compile_Release_32',
-  'Skia_Shuttle_Ubuntu12_ATI5770_Float_Compile_Debug_64',
-  'Skia_Shuttle_Ubuntu12_ATI5770_Float_Compile_Release_64',
-  'Skia_NexusS_4-1_Float_Compile_Debug_32',
-  'Skia_NexusS_4-1_Float_Compile_Release_32',
-  'Skia_Xoom_4-1_Float_Compile_Debug_32',
-  'Skia_Xoom_4-1_Float_Compile_Release_32',
-  'Skia_GalaxyNexus_4-1_Float_Compile_Debug_32',
-  'Skia_GalaxyNexus_4-1_Float_Compile_Release_32',
-  'Skia_Nexus4_4-1_Float_Compile_Debug_32',
-  'Skia_Nexus4_4-1_Float_Compile_Release_32',
-  'Skia_Nexus7_4-1_Float_Compile_Debug_32',
-  'Skia_Nexus7_4-1_Float_Compile_Release_32',
-  'Skia_Nexus10_4-1_Float_Compile_Debug_32',
-  'Skia_Nexus10_4-1_Float_Compile_Release_32',
-  'Skia_RazrI_4-1_Float_Compile_Debug_32',
-  'Skia_RazrI_4-1_Float_Compile_Release_32',
-  'Skia_Linux_NoGPU_Compile_Debug_32',
-  'Skia_Linux_NoGPU_Compile_Release_32',
-  'Skia_ChromeOS_Alex_Compile_Debug_32',
-  'Skia_ChromeOS_Alex_Compile_Release_32',
-  'Skia_Shuttle_Ubuntu12_NaCl_Compile_Debug',
-  'Skia_Shuttle_Ubuntu12_NaCl_Compile_Release',
-  'Skia_Shuttle_Ubuntu12_ATI5770_Float_Compile_Debug_32_Trybot',
-  'Skia_Shuttle_Ubuntu12_ATI5770_Float_Compile_Release_32_Trybot',
-  'Skia_Shuttle_Ubuntu12_ATI5770_Float_Compile_Debug_64_Trybot',
-  'Skia_Shuttle_Ubuntu12_ATI5770_Float_Compile_Release_64_Trybot',
-  'Skia_NexusS_4-1_Float_Compile_Debug_32_Trybot',
-  'Skia_NexusS_4-1_Float_Compile_Release_32_Trybot',
-  'Skia_Xoom_4-1_Float_Compile_Debug_32_Trybot',
-  'Skia_Xoom_4-1_Float_Compile_Release_32_Trybot',
-  'Skia_GalaxyNexus_4-1_Float_Compile_Debug_32_Trybot',
-  'Skia_GalaxyNexus_4-1_Float_Compile_Release_32_Trybot',
-  'Skia_Nexus4_4-1_Float_Compile_Debug_32_Trybot',
-  'Skia_Nexus4_4-1_Float_Compile_Release_32_Trybot',
-  'Skia_Nexus7_4-1_Float_Compile_Debug_32_Trybot',
-  'Skia_Nexus7_4-1_Float_Compile_Release_32_Trybot',
-  'Skia_Nexus10_4-1_Float_Compile_Debug_32_Trybot',
-  'Skia_Nexus10_4-1_Float_Compile_Release_32_Trybot',
-  'Skia_RazrI_4-1_Float_Compile_Debug_32_Trybot',
-  'Skia_RazrI_4-1_Float_Compile_Release_32_Trybot',
-  'Skia_Linux_NoGPU_Compile_Debug_32_Trybot',
-  'Skia_Linux_NoGPU_Compile_Release_32_Trybot',
-  'Skia_ChromeOS_Alex_Compile_Debug_32_Trybot',
-  'Skia_ChromeOS_Alex_Compile_Release_32_Trybot',
-  'Skia_Shuttle_Ubuntu12_NaCl_Compile_Debug_Trybot',
-  'Skia_Shuttle_Ubuntu12_NaCl_Compile_Release_Trybot',
+  'Ubuntu_12-ShuttleA-ATI5770-DebugCompile-32',
+  'Ubuntu_12-ShuttleA-ATI5770-ReleaseCompile-32',
+  'Ubuntu_12-ShuttleA-ATI5770-DebugCompile-64',
+  'Ubuntu_12-ShuttleA-ATI5770-ReleaseCompile-64',
+  'Android-NexusS-SGX540-DebugCompile-32',
+  'Android-NexusS-SGX540-ReleaseCompile-32',
+  'Android-Xoom-Tegra2-DebugCompile-32',
+  'Android-Xoom-Tegra2-ReleaseCompile-32',
+  'Android-GalaxyNexus-SGX540-DebugCompile-32',
+  'Android-GalaxyNexus-SGX540-ReleaseCompile-32',
+  'Android-Nexus4-Adreno320-DebugCompile-32',
+  'Android-Nexus4-Adreno320-ReleaseCompile-32',
+  'Android-Nexus7-Tegra3-DebugCompile-32',
+  'Android-Nexus7-Tegra3-ReleaseCompile-32',
+  'Android-Nexus10-MaliT604-DebugCompile-32',
+  'Android-Nexus10-MaliT604-ReleaseCompile-32',
+  'Android-RazrI-SGX540-DebugCompile-32',
+  'Android-RazrI-SGX540-ReleaseCompile-32',
+  'Ubuntu_12-ShuttleA-NoGPU-DebugCompile-32',
+  'Ubuntu_12-ShuttleA-NoGPU-ReleaseCompile-32',
+  'ChromeOS-Alex-GMA3150-DebugCompile-32',
+  'ChromeOS-Alex-GMA3150-ReleaseCompile-32',
+  'Ubuntu_12-ShuttleA-ATI5770-DebugCompile-32_64-NaCl',
+  'Ubuntu_12-ShuttleA-ATI5770-ReleaseCompile-32_64-NaCl',
 ]
 
+
 def _Format(obj, dictionary):
   """ Recursively apply the dictionary to any format strings in the requested
   object. Returns a copy and does not modify the original. """
@@ -81,6 +61,7 @@
     return rv
   return obj
 
+
 def SelfReferenceFormat(dictionary):
   """ Apply a format string to a dictionary in order to allow self-referencial
   keys and values. For example:
@@ -104,17 +85,21 @@
   """
   return _Format(dictionary, dictionary)
 
+
+def AddTrybots(slave_dict):
+  slave_dict['builder'].extend(
+      [builder + utils.BUILDER_NAME_SEP + utils.TRYBOT_NAME_SUFFIX \
+       for builder in slave_dict['builder']])
+
+
 slaves = [SelfReferenceFormat(d) for d in [
   {
     'master': 'Skia',
     'hostname': 'skiabot-shuttle-ubuntu12-nexuss-001',
     'builder': [
-        'Skia_NexusS_4-1_Float_Debug_32',
-        'Skia_NexusS_4-1_Float_Release_32',
-        'Skia_NexusS_4-1_Float_Bench_32',
-        'Skia_NexusS_4-1_Float_Debug_32_Trybot',
-        'Skia_NexusS_4-1_Float_Release_32_Trybot',
-        'Skia_NexusS_4-1_Float_Bench_32_Trybot',
+        'Android-NexusS-SGX540-Debug-32',
+        'Android-NexusS-SGX540-Release-32',
+        'Android-NexusS-SGX540-Bench-32',
         ],
     'serial': '3835BCDAEF6F00EC',
     'num_cores': '2',
@@ -125,12 +110,9 @@
     'master': 'Skia',
     'hostname': 'skiabot-shuttle-ubuntu12-nexuss-002',
     'builder': [
-        'Skia_NexusS_4-1_Float_Debug_32',
-        'Skia_NexusS_4-1_Float_Release_32',
-        'Skia_NexusS_4-1_Float_Bench_32',
-        'Skia_NexusS_4-1_Float_Debug_32_Trybot',
-        'Skia_NexusS_4-1_Float_Release_32_Trybot',
-        'Skia_NexusS_4-1_Float_Bench_32_Trybot',
+        'Android-NexusS-SGX540-Debug-32',
+        'Android-NexusS-SGX540-Release-32',
+        'Android-NexusS-SGX540-Bench-32',
         ],
     'serial': '3935B4F8CA4B00EC',
     'num_cores': '2',
@@ -141,12 +123,9 @@
     'master': 'Skia',
     'hostname': 'skiabot-shuttle-ubuntu12-xoom-001',
     'builder': [
-        'Skia_Xoom_4-1_Float_Debug_32',
-        'Skia_Xoom_4-1_Float_Release_32',
-        'Skia_Xoom_4-1_Float_Bench_32',
-        'Skia_Xoom_4-1_Float_Debug_32_Trybot',
-        'Skia_Xoom_4-1_Float_Release_32_Trybot',
-        'Skia_Xoom_4-1_Float_Bench_32_Trybot',
+        'Android-Xoom-Tegra2-Debug-32',
+        'Android-Xoom-Tegra2-Release-32',
+        'Android-Xoom-Tegra2-Bench-32',
         ],
     'serial': '1700618542c101d7',
     'num_cores': '2',
@@ -157,12 +136,9 @@
     'master': 'Skia',
     'hostname': 'skiabot-shuttle-ubuntu12-xoom-002',
     'builder': [
-        'Skia_Xoom_4-1_Float_Debug_32',
-        'Skia_Xoom_4-1_Float_Release_32',
-        'Skia_Xoom_4-1_Float_Bench_32',
-        'Skia_Xoom_4-1_Float_Debug_32_Trybot',
-        'Skia_Xoom_4-1_Float_Release_32_Trybot',
-        'Skia_Xoom_4-1_Float_Bench_32_Trybot',
+        'Android-Xoom-Tegra2-Debug-32',
+        'Android-Xoom-Tegra2-Release-32',
+        'Android-Xoom-Tegra2-Bench-32',
         ],
     'serial': '027c104942212397',
     'num_cores': '2',
@@ -173,12 +149,9 @@
     'master': 'Skia',
     'hostname': 'skiabot-shuttle-ubuntu12-xoom-003',
     'builder': [
-        'Skia_Xoom_4-1_Float_Debug_32',
-        'Skia_Xoom_4-1_Float_Release_32',
-        'Skia_Xoom_4-1_Float_Bench_32',
-        'Skia_Xoom_4-1_Float_Debug_32_Trybot',
-        'Skia_Xoom_4-1_Float_Release_32_Trybot',
-        'Skia_Xoom_4-1_Float_Bench_32_Trybot',
+        'Android-Xoom-Tegra2-Debug-32',
+        'Android-Xoom-Tegra2-Release-32',
+        'Android-Xoom-Tegra2-Bench-32',
         ],
     'serial': '1700618443a00497',
     'num_cores': '2',
@@ -189,12 +162,9 @@
     'master': 'Skia',
     'hostname': 'skiabot-shuttle-ubuntu12-galaxynexus-001',
     'builder': [
-        'Skia_GalaxyNexus_4-1_Float_Debug_32',
-        'Skia_GalaxyNexus_4-1_Float_Release_32',
-        'Skia_GalaxyNexus_4-1_Float_Bench_32',
-        'Skia_GalaxyNexus_4-1_Float_Debug_32_Trybot',
-        'Skia_GalaxyNexus_4-1_Float_Release_32_Trybot',
-        'Skia_GalaxyNexus_4-1_Float_Bench_32_Trybot',
+        'Android-GalaxyNexus-SGX540-Debug-32',
+        'Android-GalaxyNexus-SGX540-Release-32',
+        'Android-GalaxyNexus-SGX540-Bench-32',
         ],
     'serial': '0149A97C1601B015',
     'num_cores': '2',
@@ -205,12 +175,9 @@
     'master': 'Skia',
     'hostname': 'skiabot-shuttle-ubuntu12-nexus4-001',
     'builder': [
-        'Skia_Nexus4_4-1_Float_Debug_32',
-        'Skia_Nexus4_4-1_Float_Release_32',
-        'Skia_Nexus4_4-1_Float_Bench_32',
-        'Skia_Nexus4_4-1_Float_Debug_32_Trybot',
-        'Skia_Nexus4_4-1_Float_Release_32_Trybot',
-        'Skia_Nexus4_4-1_Float_Bench_32_Trybot',
+        'Android-Nexus4-Adreno320-Debug-32',
+        'Android-Nexus4-Adreno320-Release-32',
+        'Android-Nexus4-Adreno320-Bench-32',
         ],
     'serial': '0012746f51cea6b9',
     'num_cores': '4',
@@ -221,12 +188,9 @@
     'master': 'Skia',
     'hostname': 'skiabot-shuttle-ubuntu12-nexus7-001',
     'builder': [
-        'Skia_Nexus7_4-1_Float_Debug_32',
-        'Skia_Nexus7_4-1_Float_Release_32',
-        'Skia_Nexus7_4-1_Float_Bench_32',
-        'Skia_Nexus7_4-1_Float_Debug_32_Trybot',
-        'Skia_Nexus7_4-1_Float_Release_32_Trybot',
-        'Skia_Nexus7_4-1_Float_Bench_32_Trybot',
+        'Android-Nexus7-Tegra3-Debug-32',
+        'Android-Nexus7-Tegra3-Release-32',
+        'Android-Nexus7-Tegra3-Bench-32',
         ],
     'serial': '015d210a13480604',
     'num_cores': '4',
@@ -237,12 +201,9 @@
     'master': 'Skia',
     'hostname': 'skiabot-shuttle-ubuntu12-nexus7-002',
     'builder': [
-        'Skia_Nexus7_4-1_Float_Debug_32',
-        'Skia_Nexus7_4-1_Float_Release_32',
-        'Skia_Nexus7_4-1_Float_Bench_32',
-        'Skia_Nexus7_4-1_Float_Debug_32_Trybot',
-        'Skia_Nexus7_4-1_Float_Release_32_Trybot',
-        'Skia_Nexus7_4-1_Float_Bench_32_Trybot',
+        'Android-Nexus7-Tegra3-Debug-32',
+        'Android-Nexus7-Tegra3-Release-32',
+        'Android-Nexus7-Tegra3-Bench-32',
         ],
     'serial': '015d18848c280217',
     'num_cores': '4',
@@ -253,12 +214,9 @@
     'master': 'Skia',
     'hostname': 'skiabot-shuttle-ubuntu12-nexus7-003',
     'builder': [
-        'Skia_Nexus7_4-1_Float_Debug_32',
-        'Skia_Nexus7_4-1_Float_Release_32',
-        'Skia_Nexus7_4-1_Float_Bench_32',
-        'Skia_Nexus7_4-1_Float_Debug_32_Trybot',
-        'Skia_Nexus7_4-1_Float_Release_32_Trybot',
-        'Skia_Nexus7_4-1_Float_Bench_32_Trybot',
+        'Android-Nexus7-Tegra3-Debug-32',
+        'Android-Nexus7-Tegra3-Release-32',
+        'Android-Nexus7-Tegra3-Bench-32',
         ],
     'serial': '015d16897c401e17',
     'num_cores': '4',
@@ -269,12 +227,9 @@
     'master': 'Skia',
     'hostname': 'skiabot-shuttle-ubuntu12-nexus10-001',
     'builder': [
-        'Skia_Nexus10_4-1_Float_Debug_32',
-        'Skia_Nexus10_4-1_Float_Release_32',
-        'Skia_Nexus10_4-1_Float_Bench_32',
-        'Skia_Nexus10_4-1_Float_Debug_32_Trybot',
-        'Skia_Nexus10_4-1_Float_Release_32_Trybot',
-        'Skia_Nexus10_4-1_Float_Bench_32_Trybot',
+        'Android-Nexus10-MaliT604-Debug-32',
+        'Android-Nexus10-MaliT604-Release-32',
+        'Android-Nexus10-MaliT604-Bench-32',
         ],
     'serial': 'R32C801B5LH',
     'num_cores': '2',
@@ -285,12 +240,9 @@
     'master': 'Skia',
     'hostname': 'skiabot-shuttle-ubuntu12-nexus10-002',
     'builder': [
-        'Skia_Nexus10_4-1_Float_Debug_32',
-        'Skia_Nexus10_4-1_Float_Release_32',
-        'Skia_Nexus10_4-1_Float_Bench_32',
-        'Skia_Nexus10_4-1_Float_Debug_32_Trybot',
-        'Skia_Nexus10_4-1_Float_Release_32_Trybot',
-        'Skia_Nexus10_4-1_Float_Bench_32_Trybot',
+        'Android-Nexus10-MaliT604-Debug-32',
+        'Android-Nexus10-MaliT604-Release-32',
+        'Android-Nexus10-MaliT604-Bench-32',
         ],
     'serial': 'R32C801B86F',
     'num_cores': '2',
@@ -301,12 +253,9 @@
     'master': 'Skia',
     'hostname': 'skiabot-shuttle-ubuntu12-nexus10-003',
     'builder': [
-        'Skia_Nexus10_4-1_Float_Debug_32',
-        'Skia_Nexus10_4-1_Float_Release_32',
-        'Skia_Nexus10_4-1_Float_Bench_32',
-        'Skia_Nexus10_4-1_Float_Debug_32_Trybot',
-        'Skia_Nexus10_4-1_Float_Release_32_Trybot',
-        'Skia_Nexus10_4-1_Float_Bench_32_Trybot',
+        'Android-Nexus10-MaliT604-Debug-32',
+        'Android-Nexus10-MaliT604-Release-32',
+        'Android-Nexus10-MaliT604-Bench-32',
         ],
     'serial': 'R32CB017X2L',
     'num_cores': '2',
@@ -317,12 +266,9 @@
     'master': 'Skia',
     'hostname': 'skiabot-shuttle-ubuntu12-razri-001',
     'builder': [
-        'Skia_RazrI_4-1_Float_Debug_32',
-        'Skia_RazrI_4-1_Float_Release_32',
-        'Skia_RazrI_4-1_Float_Bench_32',
-        'Skia_RazrI_4-1_Float_Debug_32_Trybot',
-        'Skia_RazrI_4-1_Float_Release_32_Trybot',
-        'Skia_RazrI_4-1_Float_Bench_32_Trybot',
+        'Android-RazrI-SGX540-Debug-32',
+        'Android-RazrI-SGX540-Release-32',
+        'Android-RazrI-SGX540-Bench-32',
         ],
     'serial': 'TA23702Z9Y',
     'num_cores': '1',
@@ -334,8 +280,7 @@
     'master': 'Skia',
     'hostname': 'skiabot-shuttle-ubuntu12-001',
     'builder': [
-        'Skia_Linux_NoGPU_Debug_32',
-        'Skia_Linux_NoGPU_Debug_32_Trybot',
+        'Ubuntu_12-ShuttleA-NoGPU-Debug-32',
         ],
     'num_cores': '8',
   },
@@ -343,13 +288,9 @@
     'master': 'Skia',
     'hostname': 'skiabot-shuttle-ubuntu12-002',
     'builder': [
-        'Skia_ChromeOS_Alex_Debug_32',
-        'Skia_ChromeOS_Alex_Release_32',
-        'Skia_ChromeOS_Alex_Bench_32',
-        'Skia_ChromeOS_Alex_Debug_32_Trybot',
-        'Skia_ChromeOS_Alex_Release_32_Trybot',
-        'Skia_ChromeOS_Alex_Bench_32_Trybot',
-
+        'ChromeOS-Alex-GMA3150-Debug-32',
+        'ChromeOS-Alex-GMA3150-Release-32',
+        'ChromeOS-Alex-GMA3150-Bench-32',
         ],
     'ssh_host': '192.168.1.134',
     'ssh_port': '22',
@@ -358,18 +299,12 @@
     'master': 'Skia',
     'hostname': 'skiabot-shuttle-ubuntu12-ati5770-001',
     'builder': [
-        'Skia_Shuttle_Ubuntu12_ATI5770_Float_Debug_32',
-        'Skia_Shuttle_Ubuntu12_ATI5770_Float_Release_32',
-        'Skia_Shuttle_Ubuntu12_ATI5770_Float_Bench_32',
-        'Skia_Shuttle_Ubuntu12_ATI5770_Float_Debug_64',
-        'Skia_Shuttle_Ubuntu12_ATI5770_Float_Release_64',
-        'Skia_Shuttle_Ubuntu12_ATI5770_Float_Bench_64',
-        'Skia_Shuttle_Ubuntu12_ATI5770_Float_Debug_32_Trybot',
-        'Skia_Shuttle_Ubuntu12_ATI5770_Float_Release_32_Trybot',
-        'Skia_Shuttle_Ubuntu12_ATI5770_Float_Bench_32_Trybot',
-        'Skia_Shuttle_Ubuntu12_ATI5770_Float_Debug_64_Trybot',
-        'Skia_Shuttle_Ubuntu12_ATI5770_Float_Release_64_Trybot',
-        'Skia_Shuttle_Ubuntu12_ATI5770_Float_Bench_64_Trybot',
+        'Ubuntu_12-ShuttleA-ATI5770-Debug-32',
+        'Ubuntu_12-ShuttleA-ATI5770-Release-32',
+        'Ubuntu_12-ShuttleA-ATI5770-Bench-32',
+        'Ubuntu_12-ShuttleA-ATI5770-Debug-64',
+        'Ubuntu_12-ShuttleA-ATI5770-Release-64',
+        'Ubuntu_12-ShuttleA-ATI5770-Bench-64',
         ],
     'num_cores': '8',
   },
@@ -378,14 +313,10 @@
     'master': 'Skia',
     'hostname': 'skiabot-macmini-10_6-%s' % ('%d' % i).zfill(INTEGER_WIDTH),
     'builder': [
-        'Skia_Mac_Float_Debug_32',
-        'Skia_Mac_Float_Release_32',
-        'Skia_Mac_Float_Debug_64',
-        'Skia_Mac_Float_Release_64',
-        'Skia_Mac_Float_Debug_32_Trybot',
-        'Skia_Mac_Float_Release_32_Trybot',
-        'Skia_Mac_Float_Debug_64_Trybot',
-        'Skia_Mac_Float_Release_64_Trybot',
+        'Mac_10.6-MacMini4,1-GeForce320M-Debug-32',

[rmistry, 2013/04/22 18:58:20]

Eric shared the current names with me at
http://nautilus.cnc.corp.google.com:10125/builders

The comments I had were:
* The underscore in OS_Version is not very consistent with the rest of the
string, but Eric explained that it would make it easier to split the OS and
Version if we ever need to, this makes sense. Alternatively, we could remove the
underscore and make it look like Mac10.6-...
  This will probably not make it harder to search in the dashboard if we only
search for substrings. Either way I do not have a strong preference and I
understand the opposing argument.

* Regarding the ',' in MacMini4,1 I prefer if this was a '.'. I understand the
motivation to use the model name as specified by the vendor but we can always
use our own mapping of characters. Also, if a model name contained '-' then we
would not use it and would want to substitute something else in its place. We
could be consistent here and say any non alphanumeric character will be
substituted with a '.'.

* Since it is not useful to have the GPU specified for compile builders, that
section for the compile builders could stand for the compiler. Maybe we can
establish the rule that it stands for GPU *except* for compile builders.

* I also recommended that instead of '-ReleaseCompile-64' we use either
'-CompileRelease-64' or '-Release-64-Compile', it makes it slightly easier to
read but maybe this is a personal preference.

+        'Mac_10.6-MacMini4,1-GeForce320M-Release-32',
+        'Mac_10.6-MacMini4,1-GeForce320M-Debug-64',
+        'Mac_10.6-MacMini4,1-GeForce320M-Release-64',
         ],
     'num_cores': '4',
   } for i in range(CONCURRENT_BUILDERS)
@@ -394,14 +325,10 @@
     'master': 'Skia',
     'hostname': 'skiabot-macmini-10_7-%s' % ('%d' % i).zfill(INTEGER_WIDTH),
     'builder': [
-        'Skia_MacMiniLion_Float_Debug_32',
-        'Skia_MacMiniLion_Float_Release_32',
-        'Skia_MacMiniLion_Float_Debug_64',
-        'Skia_MacMiniLion_Float_Release_64',
-        'Skia_MacMiniLion_Float_Debug_32_Trybot',
-        'Skia_MacMiniLion_Float_Release_32_Trybot',
-        'Skia_MacMiniLion_Float_Debug_64_Trybot',
-        'Skia_MacMiniLion_Float_Release_64_Trybot',
+        'Mac_10.7-MacMini4,1-GeForce320M-Debug-32',
+        'Mac_10.7-MacMini4,1-GeForce320M-Release-32',
+        'Mac_10.7-MacMini4,1-GeForce320M-Debug-64',
+        'Mac_10.7-MacMini4,1-GeForce320M-Release-64',
         ],
     'num_cores': '4',
   } for i in range(CONCURRENT_BUILDERS)
@@ -410,14 +337,10 @@
     'master': 'Skia',
     'hostname': 'skiabot-macmini-10_8-%s' % ('%d' % i).zfill(INTEGER_WIDTH),
     'builder': [
-        'Skia_MacMini_10_8_Float_Debug_32',
-        'Skia_MacMini_10_8_Float_Release_32',
-        'Skia_MacMini_10_8_Float_Debug_64',
-        'Skia_MacMini_10_8_Float_Release_64',
-        'Skia_MacMini_10_8_Float_Debug_32_Trybot',
-        'Skia_MacMini_10_8_Float_Release_32_Trybot',
-        'Skia_MacMini_10_8_Float_Debug_64_Trybot',
-        'Skia_MacMini_10_8_Float_Release_64_Trybot',
+        'Mac_10.8-MacMini4,1-GeForce320M-Debug-32',
+        'Mac_10.8-MacMini4,1-GeForce320M-Release-32',
+        'Mac_10.8-MacMini4,1-GeForce320M-Debug-64',
+        'Mac_10.8-MacMini4,1-GeForce320M-Release-64',
         ],
     'num_cores': '4',
   } for i in range(CONCURRENT_BUILDERS)
@@ -426,14 +349,10 @@
     'master': 'Skia',
     'hostname': 'skiabot-shuttle-win7-intel-%s' % ('%d' % i).zfill(INTEGER_WIDTH),
     'builder': [
-        'Skia_Shuttle_Win7_Intel_Float_Debug_32',
-        'Skia_Shuttle_Win7_Intel_Float_Release_32',
-        'Skia_Shuttle_Win7_Intel_Float_Debug_64',
-        'Skia_Shuttle_Win7_Intel_Float_Release_64',
-        'Skia_Shuttle_Win7_Intel_Float_Debug_32_Trybot',
-        'Skia_Shuttle_Win7_Intel_Float_Release_32_Trybot',
-        'Skia_Shuttle_Win7_Intel_Float_Debug_64_Trybot',
-        'Skia_Shuttle_Win7_Intel_Float_Release_64_Trybot',
+        'Win_7-ShuttleA-HD2000-Debug-32',
+        'Win_7-ShuttleA-HD2000-Release-32',
+        'Win_7-ShuttleA-HD2000-Debug-64',
+        'Win_7-ShuttleA-HD2000-Release-64',
         ],
     'num_cores': '8',
   } for i in range(CONCURRENT_BUILDERS)
@@ -442,14 +361,10 @@
     'master': 'Skia',
     'hostname': 'skiabot-shuttle-win7-intel-special-%s' % ('%d' % i).zfill(INTEGER_WIDTH),
     'builder': [
-        'Skia_Shuttle_Win7_Intel_Float_ANGLE_Debug_32',
-        'Skia_Shuttle_Win7_Intel_Float_ANGLE_Release_32',
-        'Skia_Shuttle_Win7_Intel_Float_DirectWrite_Debug_32',
-        'Skia_Shuttle_Win7_Intel_Float_DirectWrite_Release_32',
-        'Skia_Shuttle_Win7_Intel_Float_ANGLE_Debug_32_Trybot',
-        'Skia_Shuttle_Win7_Intel_Float_ANGLE_Release_32_Trybot',
-        'Skia_Shuttle_Win7_Intel_Float_DirectWrite_Debug_32_Trybot',
-        'Skia_Shuttle_Win7_Intel_Float_DirectWrite_Release_32_Trybot',
+        'Win_7-ShuttleA-HD2000-Debug-32-ANGLE',
+        'Win_7-ShuttleA-HD2000-Release-32-ANGLE',
+        'Win_7-ShuttleA-HD2000-Debug-32-DirectWrite',
+        'Win_7-ShuttleA-HD2000-Release-32-DirectWrite',
         ],
     'num_cores': '8',
   } for i in range(CONCURRENT_BUILDERS)
@@ -458,64 +373,50 @@
     'master': 'Skia',
     'hostname': 'skiabot-macmini-10_6-bench',
     'builder': [
-        'Skia_Mac_Float_Bench_32',
-        'Skia_Mac_Float_Bench_64',
-        'Skia_Mac_Float_Bench_32_Trybot',
-        'Skia_Mac_Float_Bench_64_Trybot',
+        'Mac_10.6-MacMini4,1-GeForce320M-Bench-32',
+        'Mac_10.6-MacMini4,1-GeForce320M-Bench-64',
         ],
   },
   {
     'master': 'Skia',
     'hostname': 'skiabot-macmini-10_7-bench',
     'builder': [
-        'Skia_MacMiniLion_Float_Bench_32',
-        'Skia_MacMiniLion_Float_Bench_64',
-        'Skia_MacMiniLion_Float_Bench_32_Trybot',
-        'Skia_MacMiniLion_Float_Bench_64_Trybot',
+        'Mac_10.7-MacMini4,1-GeForce320M-Bench-32',
+        'Mac_10.7-MacMini4,1-GeForce320M-Bench-64',
         ],
   },
   {
     'master': 'Skia',
     'hostname': 'skiabot-macmini-10_8-bench',
     'builder': [
-        'Skia_MacMini_10_8_Float_Bench_32',
-        'Skia_MacMini_10_8_Float_Bench_64',
-        'Skia_MacMini_10_8_Float_Bench_32_Trybot',
-        'Skia_MacMini_10_8_Float_Bench_64_Trybot',
+        'Mac_10.8-MacMini4,1-GeForce320M-Bench-32',
+        'Mac_10.8-MacMini4,1-GeForce320M-Bench-64',
         ],
   },
   {
     'master': 'Skia',
     'hostname': 'skiabot-shuttle-win7-intel-bench',
     'builder': [
-        'Skia_Shuttle_Win7_Intel_Float_Bench_64',
-        'Skia_Shuttle_Win7_Intel_Float_Bench_32',
-        'Skia_Shuttle_Win7_Intel_Float_ANGLE_Bench_32',
-        'Skia_Shuttle_Win7_Intel_Float_DirectWrite_Bench_32',
-        'Skia_Shuttle_Win7_Intel_Float_Bench_64_Trybot',
-        'Skia_Shuttle_Win7_Intel_Float_Bench_32_Trybot',
-        'Skia_Shuttle_Win7_Intel_Float_ANGLE_Bench_32_Trybot',
-        'Skia_Shuttle_Win7_Intel_Float_DirectWrite_Bench_32_Trybot',
+        'Win_7-ShuttleA-HD2000-Bench-32',
+        'Win_7-ShuttleA-HD2000-Bench-64',
+        'Win_7-ShuttleA-HD2000-Bench-32-ANGLE',
+        'Win_7-ShuttleA-HD2000-Bench-32-DirectWrite',
         ],
   },
   {
     'master': 'Skia',
     'hostname': 'skia-housekeeping-slave-a',
     'builder': [
-        'Skia_PerCommit_House_Keeping',
-        'Skia_Periodic_House_Keeping',
-        'Skia_PerCommit_House_Keeping_Trybot',
-        'Skia_Periodic_House_Keeping_Trybot',
+        'PerCommit-Housekeeping',
+        'Periodic-Housekeeping',
         ],
   },
   {
     'master': 'Skia',
     'hostname': 'skia-housekeeping-slave-b',
     'builder': [
-        'Skia_PerCommit_House_Keeping',
-        'Skia_Periodic_House_Keeping',
-        'Skia_PerCommit_House_Keeping_Trybot',
-        'Skia_Periodic_House_Keeping_Trybot',
+        'PerCommit-Housekeeping',
+        'Periodic-Housekeeping',
         ],
   },
 ] + [
@@ -541,14 +442,10 @@
     'master': 'Skia',
     'hostname': 'skiabot-mac-10_6-compile-%s' % ('%d' % i).zfill(INTEGER_WIDTH),
     'builder': [
-        'Skia_Mac_Float_Compile_Debug_32',
-        'Skia_Mac_Float_Compile_Release_32',
-        'Skia_Mac_Float_Compile_Debug_64',
-        'Skia_Mac_Float_Compile_Release_64',
-        'Skia_Mac_Float_Compile_Debug_32_Trybot',
-        'Skia_Mac_Float_Compile_Release_32_Trybot',
-        'Skia_Mac_Float_Compile_Debug_64_Trybot',
-        'Skia_Mac_Float_Compile_Release_64_Trybot',
+        'Mac_10.6-MacMini4,1-GeForce320M-DebugCompile-32',
+        'Mac_10.6-MacMini4,1-GeForce320M-ReleaseCompile-32',
+        'Mac_10.6-MacMini4,1-GeForce320M-DebugCompile-64',
+        'Mac_10.6-MacMini4,1-GeForce320M-ReleaseCompile-64',
         ],
     'num_cores': '8',
   } for i in range(COMPILE_BUILDERS)
@@ -557,18 +454,12 @@
     'master': 'Skia',
     'hostname': 'skiabot-mac-10_7-compile-%s' % ('%d' % i).zfill(INTEGER_WIDTH),
     'builder': [
-        'Skia_MacMiniLion_Float_Compile_Debug_32',
-        'Skia_MacMiniLion_Float_Compile_Release_32',
-        'Skia_MacMiniLion_Float_Compile_Debug_64',
-        'Skia_MacMiniLion_Float_Compile_Release_64',
-        'Skia_iOS_Compile_Debug_32',
-        'Skia_iOS_Compile_Release_32',
-        'Skia_MacMiniLion_Float_Compile_Debug_32_Trybot',
-        'Skia_MacMiniLion_Float_Compile_Release_32_Trybot',
-        'Skia_MacMiniLion_Float_Compile_Debug_64_Trybot',
-        'Skia_MacMiniLion_Float_Compile_Release_64_Trybot',
-        'Skia_iOS_Compile_Debug_32_Trybot',
-        'Skia_iOS_Compile_Release_32_Trybot',
+        'Mac_10.7-MacMini4,1-GeForce320M-DebugCompile-32',
+        'Mac_10.7-MacMini4,1-GeForce320M-ReleaseCompile-32',
+        'Mac_10.7-MacMini4,1-GeForce320M-DebugCompile-64',
+        'Mac_10.7-MacMini4,1-GeForce320M-ReleaseCompile-64',
+        'iOS_6-iPhone-SGX543MP3-DebugCompile-32',
+        'iOS_6-iPhone-SGX543MP3-ReleaseCompile-32',
         ],
     'num_cores': '8',
   } for i in range(COMPILE_BUILDERS)
@@ -577,14 +468,10 @@
     'master': 'Skia',
     'hostname': 'skiabot-mac-10_8-compile-%s' % ('%d' % i).zfill(INTEGER_WIDTH),
     'builder': [
-        'Skia_MacMini_10_8_Float_Compile_Debug_32',
-        'Skia_MacMini_10_8_Float_Compile_Release_32',
-        'Skia_MacMini_10_8_Float_Compile_Debug_64',
-        'Skia_MacMini_10_8_Float_Compile_Release_64',
-        'Skia_MacMini_10_8_Float_Compile_Debug_32_Trybot',
-        'Skia_MacMini_10_8_Float_Compile_Release_32_Trybot',
-        'Skia_MacMini_10_8_Float_Compile_Debug_64_Trybot',
-        'Skia_MacMini_10_8_Float_Compile_Release_64_Trybot',
+        'Mac_10.8-MacMini4,1-GeForce320M-DebugCompile-32',
+        'Mac_10.8-MacMini4,1-GeForce320M-ReleaseCompile-32',
+        'Mac_10.8-MacMini4,1-GeForce320M-DebugCompile-64',
+        'Mac_10.8-MacMini4,1-GeForce320M-ReleaseCompile-64',
         ],
     'num_cores': '8',
   } for i in range(COMPILE_BUILDERS)
@@ -593,23 +480,20 @@
     'master': 'Skia',
     'hostname': 'skiabot-win-compile-%s' % ('%d' % i).zfill(INTEGER_WIDTH),
     'builder': [
-        'Skia_Shuttle_Win7_Intel_Float_Compile_Debug_32',
-        'Skia_Shuttle_Win7_Intel_Float_Compile_Release_32',
-        'Skia_Shuttle_Win7_Intel_Float_Compile_Debug_64',
-        'Skia_Shuttle_Win7_Intel_Float_Compile_Release_64',
-        'Skia_Shuttle_Win7_Intel_Float_ANGLE_Compile_Debug_32',
-        'Skia_Shuttle_Win7_Intel_Float_ANGLE_Compile_Release_32',
-        'Skia_Shuttle_Win7_Intel_Float_DirectWrite_Compile_Debug_32',
-        'Skia_Shuttle_Win7_Intel_Float_DirectWrite_Compile_Release_32',
-        'Skia_Shuttle_Win7_Intel_Float_Compile_Debug_32_Trybot',
-        'Skia_Shuttle_Win7_Intel_Float_Compile_Release_32_Trybot',
-        'Skia_Shuttle_Win7_Intel_Float_Compile_Debug_64_Trybot',
-        'Skia_Shuttle_Win7_Intel_Float_Compile_Release_64_Trybot',
-        'Skia_Shuttle_Win7_Intel_Float_ANGLE_Compile_Debug_32_Trybot',
-        'Skia_Shuttle_Win7_Intel_Float_ANGLE_Compile_Release_32_Trybot',
-        'Skia_Shuttle_Win7_Intel_Float_DirectWrite_Compile_Debug_32_Trybot',
-        'Skia_Shuttle_Win7_Intel_Float_DirectWrite_Compile_Release_32_Trybot',
+        'Win_7-ShuttleA-HD2000-DebugCompile-32',
+        'Win_7-ShuttleA-HD2000-ReleaseCompile-32',
+        'Win_7-ShuttleA-HD2000-DebugCompile-64',
+        'Win_7-ShuttleA-HD2000-ReleaseCompile-64',
+        'Win_7-ShuttleA-HD2000-DebugCompile-32-ANGLE',
+        'Win_7-ShuttleA-HD2000-ReleaseCompile-32-ANGLE',
+        'Win_7-ShuttleA-HD2000-DebugCompile-32-DirectWrite',
+        'Win_7-ShuttleA-HD2000-ReleaseCompile-32-DirectWrite',
         ],
     'num_cores': '8',
   } for i in range(COMPILE_BUILDERS)
 ]]
+
+
+for slave_dict in slaves:
+  AddTrybots(slave_dict)
+