Change Builder Names, MkII

master/slaves.cfg

 # -*- python -*-
 # ex: set syntax=python:
 
 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # See master.experimental/slaves.cfg for documentation.
 
 
+from skia_master_scripts import utils
+
+
 INTEGER_WIDTH = 3
 CONCURRENT_BUILDERS = 8
 COMPILE_BUILDERS = 10
 ANDROID_KEEPALIVE_CONDITION = ['python',
     'buildbot/slave/skia_slave_scripts/android_verify_device.py', '--serial',
     '%(serial)s']
 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',
+  'Build-Ubuntu12-GCC-Debug-32',

[epoger, 2013/04/24 18:56:10]

So much cleaner!!!

+  'Build-Ubuntu12-GCC-Release-32',
+  'Build-Ubuntu12-GCC-Debug-64',
+  'Build-Ubuntu12-GCC-Release-64',
+  'Build-Ubuntu12-GCC-Debug-64-NoGPU',
+  'Build-Ubuntu12-GCC-Release-64-NoGPU',
+  'Build-Ubuntu12-GCC-Debug-NaCl',
+  'Build-Ubuntu12-GCC-Release-NaCl',
+  'Build-Ubuntu12-GCC-Debug-32-NexusS',
+  'Build-Ubuntu12-GCC-Release-32-NexusS',
+  'Build-Ubuntu12-GCC-Debug-32-Xoom',
+  'Build-Ubuntu12-GCC-Release-32-Xoom',
+  'Build-Ubuntu12-GCC-Debug-32-GalaxyNexus',
+  'Build-Ubuntu12-GCC-Release-32-GalaxyNexus',
+  'Build-Ubuntu12-GCC-Debug-32-Nexus4',
+  'Build-Ubuntu12-GCC-Release-32-Nexus4',
+  'Build-Ubuntu12-GCC-Debug-32-Nexus7',
+  'Build-Ubuntu12-GCC-Release-32-Nexus7',
+  'Build-Ubuntu12-GCC-Debug-32-Nexus10',
+  'Build-Ubuntu12-GCC-Release-32-Nexus10',
+  'Build-Ubuntu12-GCC-Debug-32-RazrI',
+  'Build-Ubuntu12-GCC-Release-32-RazrI',
+  'Build-Ubuntu12-GCC-Debug-32-ChromeOS',
+  'Build-Ubuntu12-GCC-Release-32-ChromeOS',
 ]
 
+
 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. """
   if isinstance(obj, str):
     return obj % dictionary
   if isinstance(obj, list):
     return [_Format(item, dictionary) for item in obj]
   if isinstance(obj, dict):
     rv = {}
     for key, value in obj.iteritems():
       rv[_Format(key, dictionary)] = _Format(value, dictionary)
     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:
 
   >>> d = {
   >>>   'key1': 'value',
   >>>   'key2': '%(key1)s2',
   >>> }
   >>> print SelfReferenceFormat(d)['key2']
   value2
 
   Note that chains of references are not supported:
 
   >>> d = {
   >>>   'key1': 'value',
   >>>   'key2': '%(key1)s2',
   >>>   'key3': '%(key2)s_fail',
   >>> }
   >>> print SelfReferenceFormat(d)['key3']
   %(key1)s2_fail
   """
   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',
+        'Test-Android-NexusS-SGX540-Debug-32',
+        'Test-Android-NexusS-SGX540-Release-32',
+        'Perf-Android-NexusS-SGX540-Release-32',
         ],
     'serial': '3835BCDAEF6F00EC',
     'num_cores': '2',
     'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION],
     'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT,
   },
   {
     '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',
+        'Test-Android-NexusS-SGX540-Debug-32',
+        'Test-Android-NexusS-SGX540-Release-32',
+        'Perf-Android-NexusS-SGX540-Release-32',
         ],
     'serial': '3935B4F8CA4B00EC',
     'num_cores': '2',
     'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION],
     'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT,
   },
   {
     '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',
+        'Test-Android-Xoom-Tegra2-Debug-32',
+        'Test-Android-Xoom-Tegra2-Release-32',
+        'Perf-Android-Xoom-Tegra2-Release-32',
         ],
     'serial': '1700618542c101d7',
     'num_cores': '2',
     'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION],
     'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT,
   },
   {
     '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',
+        'Test-Android-Xoom-Tegra2-Debug-32',
+        'Test-Android-Xoom-Tegra2-Release-32',
+        'Perf-Android-Xoom-Tegra2-Release-32',
         ],
     'serial': '027c104942212397',
     'num_cores': '2',
     'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION],
     'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT,
   },
   {
     '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',
+        'Test-Android-Xoom-Tegra2-Debug-32',
+        'Test-Android-Xoom-Tegra2-Release-32',
+        'Perf-Android-Xoom-Tegra2-Release-32',
         ],
     'serial': '1700618443a00497',
     'num_cores': '2',
     'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION],
     'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT,
   },
   {
     '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',
+        'Test-Android-GalaxyNexus-SGX540-Debug-32',
+        'Test-Android-GalaxyNexus-SGX540-Release-32',
+        'Perf-Android-GalaxyNexus-SGX540-Release-32',
         ],
     'serial': '0149A97C1601B015',
     'num_cores': '2',
     'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION],
     'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT,
   },
   {
     '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',
+        'Test-Android-Nexus4-Adreno320-Debug-32',
+        'Test-Android-Nexus4-Adreno320-Release-32',
+        'Perf-Android-Nexus4-Adreno320-Release-32',
         ],
     'serial': '0012746f51cea6b9',
     'num_cores': '4',
     'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION],
     'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT,
   },
   {
     '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',
+        'Test-Android-Nexus7-Tegra3-Debug-32',
+        'Test-Android-Nexus7-Tegra3-Release-32',
+        'Perf-Android-Nexus7-Tegra3-Release-32',
         ],
     'serial': '015d210a13480604',
     'num_cores': '4',
     'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION],
     'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT,
   },
   {
     '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',
+        'Test-Android-Nexus7-Tegra3-Debug-32',
+        'Test-Android-Nexus7-Tegra3-Release-32',
+        'Perf-Android-Nexus7-Tegra3-Release-32',
         ],
     'serial': '015d18848c280217',
     'num_cores': '4',
     'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION],
     'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT,
   },
   {
     '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',
+        'Test-Android-Nexus7-Tegra3-Debug-32',
+        'Test-Android-Nexus7-Tegra3-Release-32',
+        'Perf-Android-Nexus7-Tegra3-Release-32',
         ],
     'serial': '015d16897c401e17',
     'num_cores': '4',
     'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION],
     'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT,
   },
   {
     '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',
+        'Test-Android-Nexus10-MaliT604-Debug-32',
+        'Test-Android-Nexus10-MaliT604-Release-32',
+        'Perf-Android-Nexus10-MaliT604-Release-32',
         ],
     'serial': 'R32C801B5LH',
     'num_cores': '2',
     'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION],
     'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT,
   },
   {
     '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',
+        'Test-Android-Nexus10-MaliT604-Debug-32',
+        'Test-Android-Nexus10-MaliT604-Release-32',
+        'Perf-Android-Nexus10-MaliT604-Release-32',
         ],
     'serial': 'R32C801B86F',
     'num_cores': '2',
     'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION],
     'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT,
   },
   {
     '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',
+        'Test-Android-Nexus10-MaliT604-Debug-32',
+        'Test-Android-Nexus10-MaliT604-Release-32',
+        'Perf-Android-Nexus10-MaliT604-Release-32',
         ],
     'serial': 'R32CB017X2L',
     'num_cores': '2',
     'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION],
     'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT,
   },
   {
     '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',
+        'Test-Android-RazrI-SGX540-Debug-32',
+        'Test-Android-RazrI-SGX540-Release-32',
+        'Perf-Android-RazrI-SGX540-Release-32',
         ],
     'serial': 'TA23702Z9Y',
     'num_cores': '1',
     'has_root': False,
     'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION],
     'android_sdk_root': '/usr/local/google/android-sdk-linux',
   },
   {
     'master': 'Skia',
     'hostname': 'skiabot-shuttle-ubuntu12-001',
     'builder': [
-        'Skia_Linux_NoGPU_Debug_32',
-        'Skia_Linux_NoGPU_Debug_32_Trybot',
+        'Test-Ubuntu12-ShuttleA-NoGPU-Debug-64',
         ],
     'num_cores': '8',
   },
   {
     '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',
+        'Test-ChromeOS-Alex-GMA3150-Debug-32',
+        'Test-ChromeOS-Alex-GMA3150-Release-32',
+        'Perf-ChromeOS-Alex-GMA3150-Release-32',
 
         ],
     'ssh_host': '192.168.1.134',
     'ssh_port': '22',
   },
   {
     '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',
+        'Test-Ubuntu12-ShuttleA-ATI5770-Debug-32',
+        'Test-Ubuntu12-ShuttleA-ATI5770-Release-32',
+        'Perf-Ubuntu12-ShuttleA-ATI5770-Release-32',
+        'Test-Ubuntu12-ShuttleA-ATI5770-Debug-64',
+        'Test-Ubuntu12-ShuttleA-ATI5770-Release-64',
+        'Perf-Ubuntu12-ShuttleA-ATI5770-Release-64',
         ],
     'num_cores': '8',
   },
 ] + [
   {
     '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',
+        'Test-Mac10.6-MacMini4.1-GeForce320M-Debug-32',
+        'Test-Mac10.6-MacMini4.1-GeForce320M-Release-32',
+        'Test-Mac10.6-MacMini4.1-GeForce320M-Debug-64',
+        'Test-Mac10.6-MacMini4.1-GeForce320M-Release-64',

[rmistry, 2013/04/25 11:36:45]

Yaay for no commas!

         ],
     'num_cores': '4',
   } for i in range(CONCURRENT_BUILDERS)
 ] + [
   {
     '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',
+        'Test-Mac10.7-MacMini4.1-GeForce320M-Debug-32',
+        'Test-Mac10.7-MacMini4.1-GeForce320M-Release-32',
+        'Test-Mac10.7-MacMini4.1-GeForce320M-Debug-64',
+        'Test-Mac10.7-MacMini4.1-GeForce320M-Release-64',
         ],
     'num_cores': '4',
   } for i in range(CONCURRENT_BUILDERS)
 ] + [
   {
     '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',
+        'Test-Mac10.8-MacMini4.1-GeForce320M-Debug-32',
+        'Test-Mac10.8-MacMini4.1-GeForce320M-Release-32',
+        'Test-Mac10.8-MacMini4.1-GeForce320M-Debug-64',
+        'Test-Mac10.8-MacMini4.1-GeForce320M-Release-64',
         ],
     'num_cores': '4',
   } for i in range(CONCURRENT_BUILDERS)
 ] + [
   {
     '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',
+        'Test-Win7-ShuttleA-HD2000-Debug-32',
+        'Test-Win7-ShuttleA-HD2000-Release-32',
+        'Test-Win7-ShuttleA-HD2000-Debug-64',
+        'Test-Win7-ShuttleA-HD2000-Release-64',
         ],
     'num_cores': '8',
   } for i in range(CONCURRENT_BUILDERS)
 ] + [
   {
     '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',
+        'Test-Win7-ShuttleA-HD2000-Debug-32-ANGLE',
+        'Test-Win7-ShuttleA-HD2000-Release-32-ANGLE',
+        'Test-Win7-ShuttleA-HD2000-Debug-32-DirectWrite',
+        'Test-Win7-ShuttleA-HD2000-Release-32-DirectWrite',
         ],
     'num_cores': '8',
   } for i in range(CONCURRENT_BUILDERS)
 ] + [
   {
     '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',
+        'Perf-Mac10.6-MacMini4.1-GeForce320M-Release-32',
+        'Perf-Mac10.6-MacMini4.1-GeForce320M-Release-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',
+        'Perf-Mac10.7-MacMini4.1-GeForce320M-Release-32',
+        'Perf-Mac10.7-MacMini4.1-GeForce320M-Release-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',
+        'Perf-Mac10.8-MacMini4.1-GeForce320M-Release-32',
+        'Perf-Mac10.8-MacMini4.1-GeForce320M-Release-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',
+        'Perf-Win7-ShuttleA-HD2000-Release-32',
+        'Perf-Win7-ShuttleA-HD2000-Release-64',
+        'Perf-Win7-ShuttleA-HD2000-Release-32-ANGLE',
+        'Perf-Win7-ShuttleA-HD2000-Release-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',
+        'Housekeeper-PerCommit',
+        'Housekeeper-Nightly',
         ],
   },
   {
     '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',
+        'Housekeeper-PerCommit',
+        'Housekeeper-Nightly',
         ],
   },
 ] + [
   {
     'master': 'Skia',
     'hostname': 'skiabot-linux-compile-%s' % ('%d' % i).zfill(INTEGER_WIDTH),
     'builder': LINUX_COMPILE_BUILDERS,
     'num_cores': '8',
     'android_sdk_root': '/usr/local/google/home/borenet/android_sdk_linux',
     'nacl_sdk_root': '/usr/local/google/home/borenet/nacl_sdk/pepper_25',
   } for i in range(COMPILE_BUILDERS)
 ] + [
   {
     'master': 'Skia',
     'hostname': 'skiabot-linux-compile-vm-%s' % ('%d' % i).zfill(INTEGER_WIDTH),
     'builder': LINUX_COMPILE_BUILDERS,
     'num_cores': '2',
     'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT,
     'nacl_sdk_root': DEFAULT_NACL_SDK_ROOT,
   } for i in range(COMPILE_BUILDERS)
 ] + [
   {
     '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',
+        'Build-Mac10.6-GCC-Debug-32',
+        'Build-Mac10.6-GCC-Release-32',
+        'Build-Mac10.6-GCC-Debug-64',
+        'Build-Mac10.6-GCC-Release-64',
         ],
     'num_cores': '8',
   } for i in range(COMPILE_BUILDERS)
 ] + [
   {
     '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',
+        'Build-Mac10.7-Clang-Debug-32',
+        'Build-Mac10.7-Clang-Release-32',
+        'Build-Mac10.7-Clang-Debug-64',
+        'Build-Mac10.7-Clang-Release-64',
+        'Build-Mac10.7-Clang-Debug-32-iOS',
+        'Build-Mac10.7-Clang-Release-32-iOS',
         ],
     'num_cores': '8',
   } for i in range(COMPILE_BUILDERS)
 ] + [
   {
     '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',
+        'Build-Mac10.8-Clang-Debug-32',
+        'Build-Mac10.8-Clang-Release-32',
+        'Build-Mac10.8-Clang-Debug-64',
+        'Build-Mac10.8-Clang-Release-64',
         ],
     'num_cores': '8',
   } for i in range(COMPILE_BUILDERS)
 ] + [
   {
     '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',
+        'Build-Win7-VS2010-Debug-32',
+        'Build-Win7-VS2010-Release-32',
+        'Build-Win7-VS2010-Debug-64',
+        'Build-Win7-VS2010-Release-64',
+        'Build-Win7-VS2010-Debug-32-ANGLE',
+        'Build-Win7-VS2010-Release-32-ANGLE',
+        'Build-Win7-VS2010-Debug-32-DirectWrite',
+        'Build-Win7-VS2010-Release-32-DirectWrite',
         ],
     'num_cores': '8',
   } for i in range(COMPILE_BUILDERS)
 ]]
+
+
+for slave_dict in slaves:
+  AddTrybots(slave_dict)