Change builder names

master/master_builders_cfg.py

 # Copyright (c) 2012 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.
 
 # Sets up all the builders we want this buildbot master to run.
 
+#pylint: disable=C0301
+
 from skia_master_scripts import factory as skia_factory
+from skia_master_scripts import android_factory
+from skia_master_scripts import chromeos_factory
+from skia_master_scripts import housekeeping_percommit_factory
+from skia_master_scripts import housekeeping_periodic_factory
+from skia_master_scripts import ios_factory
+from skia_master_scripts import nacl_factory
 from skia_master_scripts import utils
 from skia_master_scripts.utils import MakeBuilderSet, \
-                                      MakeAndroidBuilderSet, \
-                                      MakeChromeOSBuilderSet, \
-                                      MakeIOSBuilderSet, \
-                                      MakeHousekeeperBuilderSet, \
-                                      MakeNaClBuilderSet
+                                      MakeCompileBuilderSet
 
 # Directory where we want to record performance data
 #
 # TODO(epoger): consider changing to reuse existing config.Master.perf_base_url,
 # config.Master.perf_report_url_suffix, etc.
 perf_output_basedir_linux = '../../../../perfdata'
 perf_output_basedir_mac = perf_output_basedir_linux
 perf_output_basedir_windows = '..\\..\\..\\..\\perfdata'
 
 defaults = {}
 
 
-def Update(config, active_master, c):
+ARCH_TO_GYP_DEFINE = {
+  'x86': 'skia_arch_width=32',
+  'x86_64': 'skia_arch_width=32',
+  'Arm7': 'skia_arch_width=32',
+  'NaCl': None,
+}
+
+
+def GetExtraFactoryArgs(compile_builder_info):
+  factory_type = compile_builder_info[8]
+  if factory_type == android_factory.AndroidFactory:
+    # AndroidFactory requires a "device" argument.
+    return {'device': utils.AndroidModelToDevice(compile_builder_info[4])}
+  else:
+    return {}
+
+
+def Update(config, active_master, cfg):
   helper = utils.SkiaHelper(defaults)
 
   #
   # Default (per-commit) Scheduler for Skia. Only use this for builders which
   # do not care about commits outside of SKIA_PRIMARY_SUBDIRS.
   #
   helper.AnyBranchScheduler('skia_rel', branches=utils.SKIA_PRIMARY_SUBDIRS)
 
   #
   # Periodic Scheduler for Skia. The buildbot master follows UTC.
   # Setting it to 7AM UTC (2 AM EST).
   #
   helper.PeriodicScheduler('skia_periodic', branch='trunk', minute=0, hour=7)
 
   # Schedulers for Skia trybots.
   helper.TryJobSubversion(utils.TRY_SCHEDULER_SVN)
   helper.TryJobRietveld(utils.TRY_SCHEDULER_RIETVELD)
 
   #
   # Set up all the builders.
   #
   # Don't put spaces or 'funny characters' within the builder names, so that
   # we can safely use the builder name as part of a filepath.
   #
   do_upload_results = active_master.is_production_host
 
-  # Linux (Ubuntu12) on Shuttle with ATI5770 graphics card
-  defaults['category'] = 'Linux'
-  MakeBuilderSet(
-      helper=helper,
-      builder_base_name='Skia_Shuttle_Ubuntu12_ATI5770_Float_%s_64',
-      do_upload_results=do_upload_results,
-      target_platform=skia_factory.TARGET_PLATFORM_LINUX,
-      environment_variables=
-          {'GYP_DEFINES': 'skia_scalar=float skia_mesa=0 skia_arch_width=64'},
-      gm_image_subdir='base-shuttle_ubuntu12_ati5770',
-      perf_output_basedir=perf_output_basedir_linux)
-  MakeBuilderSet(
-      helper=helper,
-      builder_base_name='Skia_Shuttle_Ubuntu12_ATI5770_Float_%s_32',
-      do_upload_results=do_upload_results,
-      target_platform=skia_factory.TARGET_PLATFORM_LINUX,
-      environment_variables=
-          {'GYP_DEFINES': 'skia_scalar=float skia_mesa=0 skia_arch_width=32'},
-      gm_image_subdir='base-shuttle_ubuntu12_ati5770',
-      perf_output_basedir=perf_output_basedir_linux)
+  gyp_win = 'skia_win_debuggers_path=c:/DbgHelp'
+  gyp_angle = gyp_win + ' skia_angle=1'
+  gyp_dw = gyp_win + ' skia_directwrite=1'
+  gyp_10_6 = 'skia_osx_sdkroot=macosx10.6'
+  gyp_10_7 = 'skia_mesa=1'
+  gyp_ios = 'skia_os=ios'
 
-  # Android (runs on a Linux buildbot slave)...
-  defaults['category'] = 'Android'
-  MakeAndroidBuilderSet(
-      helper=helper,
-      builder_base_name='Skia_NexusS_4-1_Float_%s_32',
-      device='nexus_s',
-      do_upload_results=do_upload_results,
-      target_platform=skia_factory.TARGET_PLATFORM_LINUX,
-      environment_variables={'GYP_DEFINES': 'skia_scalar=float skia_mesa=0'},
-      gm_image_subdir='base-android-nexus-s',
-      perf_output_basedir=perf_output_basedir_linux)
-  MakeAndroidBuilderSet(
-      helper=helper,
-      builder_base_name='Skia_Xoom_4-1_Float_%s_32',
-      device='xoom',
-      do_upload_results=do_upload_results,
-      target_platform=skia_factory.TARGET_PLATFORM_LINUX,
-      environment_variables={'GYP_DEFINES': 'skia_scalar=float skia_mesa=0'},
-      gm_image_subdir='base-android-xoom',
-      perf_output_basedir=perf_output_basedir_linux)
-  MakeAndroidBuilderSet(
-      helper=helper,
-      builder_base_name='Skia_GalaxyNexus_4-1_Float_%s_32',
-      device='galaxy_nexus',
-      do_upload_results=do_upload_results,
-      target_platform=skia_factory.TARGET_PLATFORM_LINUX,
-      environment_variables={'GYP_DEFINES': 'skia_scalar=float skia_mesa=0'},
-      gm_image_subdir='base-android-galaxy-nexus',
-      perf_output_basedir=perf_output_basedir_linux)
-  MakeAndroidBuilderSet(
-      helper=helper,
-      builder_base_name='Skia_Nexus4_4-1_Float_%s_32',
-      device='nexus_4',
-      do_upload_results=do_upload_results,
-      target_platform=skia_factory.TARGET_PLATFORM_LINUX,
-      environment_variables={'GYP_DEFINES': 'skia_scalar=float skia_mesa=0'},
-      gm_image_subdir='base-android-nexus-4',
-      perf_output_basedir=perf_output_basedir_linux)
-  MakeAndroidBuilderSet(
-      helper=helper,
-      builder_base_name='Skia_Nexus7_4-1_Float_%s_32',
-      device='nexus_7',
-      do_upload_results=do_upload_results,
-      target_platform=skia_factory.TARGET_PLATFORM_LINUX,
-      environment_variables={'GYP_DEFINES': 'skia_scalar=float skia_mesa=0'},
-      gm_image_subdir='base-android-nexus-7',
-      perf_output_basedir=perf_output_basedir_linux)
-  MakeAndroidBuilderSet(
-      helper=helper,
-      builder_base_name='Skia_Nexus10_4-1_Float_%s_32',
-      device='nexus_10',
-      do_upload_results=do_upload_results,
-      target_platform=skia_factory.TARGET_PLATFORM_LINUX,
-      environment_variables={'GYP_DEFINES': 'skia_scalar=float skia_mesa=0'},
-      gm_image_subdir='base-android-nexus-10',
-      perf_output_basedir=perf_output_basedir_linux)
-  MakeAndroidBuilderSet(
-      helper=helper,
-      builder_base_name='Skia_RazrI_4-1_Float_%s_32',
-      device='x86',
-      do_upload_results=do_upload_results,
-      target_platform=skia_factory.TARGET_PLATFORM_LINUX,
-      environment_variables={'GYP_DEFINES': 'skia_scalar=float skia_mesa=0'},
-      gm_image_subdir='base-android-razr-i',
-      perf_output_basedir=perf_output_basedir_linux)
+  builder_specs = {}
+  #
+  #                            COMPILE BUILDERS                                                                              TEST AND PERF BUILDERS
+  #
+  #    OS          Compiler  Config     Arch     Extra Config   GYP_DEFS       WERR                Role    OS          Model         GPU            Extra Config   GM Subdir
+  #
+  c = 'Linux'
+  f = skia_factory.SkiaFactory
+  p = skia_factory.TARGET_PLATFORM_LINUX
+  builder_specs.update({
+      ('Ubuntu12', 'GCC',    'Debug',   'x86',    None,          None,         True,  c, f, p) : [('Test', 'Ubuntu12', 'ShuttleA',   'ATI5770',     None,          'base-shuttle_ubuntu12_ati5770')],
+      ('Ubuntu12', 'GCC',    'Release', 'x86',    None,          None,         True,  c, f, p) : [('Test', 'Ubuntu12', 'ShuttleA',   'ATI5770',     None,          'base-shuttle_ubuntu12_ati5770'),
+                                                                                                  ('Perf', 'Ubuntu12', 'ShuttleA',   'ATI5770',     None,          None)],
+      ('Ubuntu12', 'GCC',    'Debug',   'x86_64', None,          None,         True,  c, f, p) : [('Test', 'Ubuntu12', 'ShuttleA',   'ATI5770',     None,          'base-shuttle_ubuntu12_ati5770')],
+      ('Ubuntu12', 'GCC',    'Release', 'x86_64', None,          None,         True,  c, f, p) : [('Test', 'Ubuntu12', 'ShuttleA',   'ATI5770',     None,          'base-shuttle_ubuntu12_ati5770'),
+                                                                                                  ('Perf', 'Ubuntu12', 'ShuttleA',   'ATI5770',     None,          None)],})
+  c = 'Linux-Special'
+  builder_specs.update({
+      ('Ubuntu12', 'GCC',    'Debug',   'x86_64', 'NoGPU',       'skia_gpu=0', True,  c, f, p) : [('Test', 'Ubuntu12', 'ShuttleA',   'NoGPU',       None,          'base-shuttle_ubuntu12_ati5770')],})
+  f = nacl_factory.NaClFactory
+  builder_specs.update({
+      ('Ubuntu12', 'GCC',    'Debug',   'NaCl',   None,          None,         True,  c, f, p) : [],
+      ('Ubuntu12', 'GCC',    'Release', 'NaCl',   None,          None,         True,  c, f, p) : [],})
+  c = 'Mac-10.6'
+  p = skia_factory.TARGET_PLATFORM_MAC
+  builder_specs.update({
+      ('Mac10.6',  'GCC',    'Debug',   'x86',    None,          gyp_10_6,     True,  c, f, p) : [('Test', 'Mac10.6',  'MacMini4.1', 'GeForce320M', None,          'base-macmini')],
+      ('Mac10.6',  'GCC',    'Release', 'x86',    None,          gyp_10_6,     True,  c, f, p) : [('Test', 'Mac10.6',  'MacMini4.1', 'GeForce320M', None,          'base-macmini'),
+                                                                                                  ('Perf', 'Mac10.6',  'MacMini4.1', 'GeForce320M', None,          None)],
+      ('Mac10.6',  'GCC',    'Debug',   'x86_64', None,          gyp_10_6,     False, c, f, p) : [('Test', 'Mac10.6',  'MacMini4.1', 'GeForce320M', None,          'base-macmini')],
+      ('Mac10.6',  'GCC',    'Release', 'x86_64', None,          gyp_10_6,     False, c, f, p) : [('Test', 'Mac10.6',  'MacMini4.1', 'GeForce320M', None,          'base-macmini'),
+                                                                                                  ('Perf', 'Mac10.6',  'MacMini4.1', 'GeForce320M', None,          None)],})
+  c = 'Mac-10.7'
+  builder_specs.update({
+      ('Mac10.7',  'Clang',  'Debug',   'x86',    None,          gyp_10_7,     True,  c, f, p) : [('Test', 'Mac10.7',  'MacMini4.1', 'GeForce320M', None,          'base-macminilion')],
+      ('Mac10.7',  'Clang',  'Release', 'x86',    None,          gyp_10_7,     True,  c, f, p) : [('Test', 'Mac10.7',  'MacMini4.1', 'GeForce320M', None,          'base-macminilion'),
+                                                                                                  ('Perf', 'Mac10.7',  'MacMini4.1', 'GeForce320M', None,          None)],
+      ('Mac10.7',  'Clang',  'Debug',   'x86_64', None,          gyp_10_7,     False, c, f, p) : [('Test', 'Mac10.7',  'MacMini4.1', 'GeForce320M', None,          'base-macminilion')],
+      ('Mac10.7',  'Clang',  'Release', 'x86_64', None,          gyp_10_7,     False, c, f, p) : [('Test', 'Mac10.7',  'MacMini4.1', 'GeForce320M', None,          'base-macminilion'),
+                                                                                                  ('Perf', 'Mac10.7',  'MacMini4.1', 'GeForce320M', None,          None)],})
+  c = 'Mac-10.8'
+  builder_specs.update({
+      ('Mac10.8',  'Clang',  'Debug',   'x86',    None,          None,         True,  c, f, p) : [('Test', 'Mac10.8',  'MacMini4.1', 'GeForce320M', None,          None)],
+      ('Mac10.8',  'Clang',  'Release', 'x86',    None,          None,         True,  c, f, p) : [('Test', 'Mac10.8',  'MacMini4.1', 'GeForce320M', None,          None),
+                                                                                                  ('Perf', 'Mac10.8',  'MacMini4.1', 'GeForce320M', None,          None)],
+      ('Mac10.8',  'Clang',  'Debug',   'x86_64', None,          None,         False, c, f, p) : [('Test', 'Mac10.8',  'MacMini4.1', 'GeForce320M', None,          None)],
+      ('Mac10.8',  'Clang',  'Release', 'x86_64', None,          None,         False, c, f, p) : [('Test', 'Mac10.8',  'MacMini4.1', 'GeForce320M', None,          None),
+                                                                                                  ('Perf', 'Mac10.8',  'MacMini4.1', 'GeForce320M', None,          None)],})
+  c = 'Win7'
+  p = skia_factory.TARGET_PLATFORM_WIN32
+  builder_specs.update({
+      ('Win7',     'VS2010', 'Debug',   'x86',    None,          gyp_win,      True,  c, f, p) : [('Test', 'Win7',     'ShuttleA',   'HD2000',      None,          None)],
+      ('Win7',     'VS2010', 'Release', 'x86',    None,          gyp_win,      True,  c, f, p) : [('Test', 'Win7',     'ShuttleA',   'HD2000',      None,          None),
+                                                                                                  ('Perf', 'Win7',     'ShuttleA',   'HD2000',      None,          None)],
+      ('Win7',     'VS2010', 'Debug',   'x86_64', None,          gyp_win,      False, c, f, p) : [('Test', 'Win7',     'ShuttleA',   'HD2000',      None,          None)],
+      ('Win7',     'VS2010', 'Release', 'x86_64', None,          gyp_win,      False, c, f, p) : [('Test', 'Win7',     'ShuttleA',   'HD2000',      None,          None),
+                                                                                                  ('Perf', 'Win7',     'ShuttleA',   'HD2000',      None,          None)],})
+  c = 'Win7-Special'
+  builder_specs.update({
+      ('Win7',     'VS2010', 'Debug',   'x86',    'ANGLE',       gyp_angle,    True,  c, f, p) : [('Test', 'Win7',     'ShuttleA',   'HD2000',      'ANGLE',       None)],
+      ('Win7',     'VS2010', 'Release', 'x86',    'ANGLE',       gyp_angle,    True,  c, f, p) : [('Test', 'Win7',     'ShuttleA',   'HD2000',      'ANGLE',       None),
+                                                                                                  ('Perf', 'Win7',     'ShuttleA',   'HD2000',      'ANGLE',       None)],
+      ('Win7',     'VS2010', 'Debug',   'x86',    'DirectWrite', gyp_dw,       False, c, f, p) : [('Test', 'Win7',     'ShuttleA',   'HD2000',      'DirectWrite', None)],
+      ('Win7',     'VS2010', 'Release', 'x86',    'DirectWrite', gyp_dw,       False, c, f, p) : [('Test', 'Win7',     'ShuttleA',   'HD2000',      'DirectWrite', None),
+                                                                                                  ('Perf', 'Win7',     'ShuttleA',   'HD2000',      'DirectWrite', None)],})
+  c = 'Android'
+  f = android_factory.AndroidFactory
+  p = skia_factory.TARGET_PLATFORM_LINUX
+  builder_specs.update({
+      ('Ubuntu12', 'GCC',    'Debug',   'Arm7',   'NexusS',      None,         True,  c, f, p) : [('Test', 'Android',  'NexusS',     'SGX540',      None,          'base-android-nexus-s')],
+      ('Ubuntu12', 'GCC',    'Release', 'Arm7',   'NexusS',      None,         True,  c, f, p) : [('Test', 'Android',  'NexusS',     'SGX540',      None,          'base-android-nexus-s'),
+                                                                                                  ('Perf', 'Android',  'NexusS',     'SGX540',      None,          None)],
+      ('Ubuntu12', 'GCC',    'Debug',   'Arm7',   'Nexus4',      None,         True,  c, f, p) : [('Test', 'Android',  'Nexus4',     'Adreno320',   None,          None)],
+      ('Ubuntu12', 'GCC',    'Release', 'Arm7',   'Nexus4',      None,         True,  c, f, p) : [('Test', 'Android',  'Nexus4',     'Adreno320',   None,          None),
+                                                                                                  ('Perf', 'Android',  'Nexus4',     'Adreno320',   None,          None)],
+      ('Ubuntu12', 'GCC',    'Debug',   'Arm7',   'Nexus7',      None,         True,  c, f, p) : [('Test', 'Android',  'Nexus7',     'Tegra3',      None,          None)],
+      ('Ubuntu12', 'GCC',    'Release', 'Arm7',   'Nexus7',      None,         True,  c, f, p) : [('Test', 'Android',  'Nexus7',     'Tegra3',      None,          None),
+                                                                                                  ('Perf', 'Android',  'Nexus7',     'Tegra3',      None,          None)],
+      ('Ubuntu12', 'GCC',    'Debug',   'Arm7',   'Nexus10',     None,         True,  c, f, p) : [('Test', 'Android',  'Nexus10',    'MaliT604',    None,          None)],
+      ('Ubuntu12', 'GCC',    'Release', 'Arm7',   'Nexus10',     None,         True,  c, f, p) : [('Test', 'Android',  'Nexus10',    'MaliT604',    None,          None),
+                                                                                                  ('Perf', 'Android',  'Nexus10',    'MaliT604',    None,          None)],
+      ('Ubuntu12', 'GCC',    'Debug',   'Arm7',   'GalaxyNexus', None,         True,  c, f, p) : [('Test', 'Android',  'GalaxyNexus','SGX540',      None,          None)],
+      ('Ubuntu12', 'GCC',    'Release', 'Arm7',   'GalaxyNexus', None,         True,  c, f, p) : [('Test', 'Android',  'GalaxyNexus','SGX540',      None,          None),
+                                                                                                  ('Perf', 'Android',  'GalaxyNexus','SGX540',      None,          None)],
+      ('Ubuntu12', 'GCC',    'Debug',   'Arm7',   'Xoom',        None,         True,  c, f, p) : [('Test', 'Android',  'Xoom',       'Tegra2',      None,          'base-android-xoom')],
+      ('Ubuntu12', 'GCC',    'Release', 'Arm7',   'Xoom',        None,         True,  c, f, p) : [('Test', 'Android',  'Xoom',       'Tegra2',      None,          'base-android-xoom'),
+                                                                                                  ('Perf', 'Android',  'Xoom',       'Tegra2',      None,          None)],
+      ('Ubuntu12', 'GCC',    'Debug',   'x86',    'RazrI',       None,         True,  c, f, p) : [('Test', 'Android',  'RazrI',      'SGX540',      None,          None)],
+      ('Ubuntu12', 'GCC',    'Release', 'x86',    'RazrI',       None,         True,  c, f, p) : [('Test', 'Android',  'RazrI',      'SGX540',      None,          None),
+                                                                                                  ('Perf', 'Android',  'RazrI',      'SGX540',      None,          None)],})
+  c = 'ChromeOS'
+  f = chromeos_factory.ChromeOSFactory
+  builder_specs.update({
+      ('Ubuntu12', 'GCC',    'Debug',   'x86',   'ChromeOS',    'skia_gpu=0', True,  c, f, p) : [('Test', 'ChromeOS', 'Alex',       'GMA3150',     None,          None)],
+      ('Ubuntu12', 'GCC',    'Release', 'x86',   'ChromeOS',    'skia_gpu=0', True,  c, f, p) : [('Test', 'ChromeOS', 'Alex',       'GMA3150',     None,          None),
+                                                                                                 ('Perf', 'ChromeOS', 'Alex',       'GMA3150',     None,          None)],})
+  c = 'iOS'
+  f = ios_factory.iOSFactory
+  p = skia_factory.TARGET_PLATFORM_MAC
+  builder_specs.update({
+      ('Mac10.7',  'Clang',  'Debug',   'Arm7',   'iOS',         gyp_ios,      True,  c, f, p) : [],
+      ('Mac10.7',  'Clang',  'Release', 'Arm7',   'iOS',         gyp_ios,      True,  c, f, p) : [],})
 
-  # Mac 10.6 (SnowLeopard) ...
-  defaults['category'] = 'Mac-10.6'
-  MakeBuilderSet(
-      helper=helper,
-      builder_base_name='Skia_Mac_Float_%s_32',
-      do_upload_results=do_upload_results,
-      target_platform=skia_factory.TARGET_PLATFORM_MAC,
-      environment_variables=
-          {'GYP_DEFINES': ('skia_osx_sdkroot=macosx10.6 skia_scalar=float '
-                           'skia_arch_width=32')},
-      gm_image_subdir='base-macmini',
-      perf_output_basedir=perf_output_basedir_mac)
-  MakeBuilderSet(
-      helper=helper,
-      builder_base_name='Skia_Mac_Float_%s_64',
-      do_upload_results=do_upload_results,
-      target_platform=skia_factory.TARGET_PLATFORM_MAC,
-      environment_variables=
-          {'GYP_DEFINES': ('skia_osx_sdkroot=macosx10.6 skia_scalar=float '
-                           'skia_arch_width=64')},
-      gm_image_subdir='base-macmini',
-      perf_output_basedir=perf_output_basedir_mac,
-      compile_bot_warnings_as_errors=False)
-
-  # Mac 10.7 (Lion) ...
-  defaults['category'] = 'Mac-10.7'
-  MakeBuilderSet(
-      helper=helper,
-      builder_base_name='Skia_MacMiniLion_Float_%s_32',
-      do_upload_results=do_upload_results,
-      target_platform=skia_factory.TARGET_PLATFORM_MAC,
-      environment_variables=
-          {'GYP_DEFINES': 'skia_scalar=float skia_mesa=1 skia_arch_width=32'},
-      gm_image_subdir='base-macmini-lion-float',
-      perf_output_basedir=perf_output_basedir_mac)
-  MakeBuilderSet(
-      helper=helper,
-      builder_base_name='Skia_MacMiniLion_Float_%s_64',
-      do_upload_results=do_upload_results,
-      target_platform=skia_factory.TARGET_PLATFORM_MAC,
-      environment_variables=
-          {'GYP_DEFINES': 'skia_scalar=float skia_mesa=1 skia_arch_width=64'},
-      gm_image_subdir='base-macmini-lion-float',
-      perf_output_basedir=perf_output_basedir_mac,
-      compile_bot_warnings_as_errors=False)
-
-  # Mac 10.8 (Mountain Lion) ...
-  defaults['category'] = 'Mac-10.8'
-  MakeBuilderSet(
-      helper=helper,
-      builder_base_name='Skia_MacMini_10_8_Float_%s_32',
-      do_upload_results=do_upload_results,
-      target_platform=skia_factory.TARGET_PLATFORM_MAC,
-      environment_variables=
-          {'GYP_DEFINES': 'skia_scalar=float skia_arch_width=32'},
-      gm_image_subdir='base-macmini-10_8',
-      perf_output_basedir=perf_output_basedir_mac)
-  MakeBuilderSet(
-      helper=helper,
-      builder_base_name='Skia_MacMini_10_8_Float_%s_64',
-      do_upload_results=do_upload_results,
-      target_platform=skia_factory.TARGET_PLATFORM_MAC,
-      environment_variables=
-          {'GYP_DEFINES': 'skia_scalar=float skia_arch_width=64'},
-      gm_image_subdir='base-macmini-10_8',
-      perf_output_basedir=perf_output_basedir_mac,
-      compile_bot_warnings_as_errors=False)
-
-  # Windows7 running on Shuttle PC with Intel Core i7-2600 with on-CPU graphics
-  defaults['category'] = 'Win7'
-  MakeBuilderSet(
-      helper=helper,
-      builder_base_name='Skia_Shuttle_Win7_Intel_Float_%s_32',
-      do_upload_results=do_upload_results,
-      target_platform=skia_factory.TARGET_PLATFORM_WIN32,
-      environment_variables=
-          {'GYP_DEFINES': ('skia_scalar=float skia_arch_width=32 '
-                           'skia_win_debuggers_path=c:/DbgHelp')},
-      gm_image_subdir='base-shuttle-win7-intel-float',
-      perf_output_basedir=perf_output_basedir_windows)
-  MakeBuilderSet(
-      helper=helper,
-      builder_base_name='Skia_Shuttle_Win7_Intel_Float_%s_64',
-      do_upload_results=do_upload_results,
-      target_platform=skia_factory.TARGET_PLATFORM_WIN32,
-      environment_variables=
-          {'GYP_DEFINES': ('skia_scalar=float skia_arch_width=64 '
-                           'skia_win_debuggers_path=c:/DbgHelp')},
-      gm_image_subdir='base-shuttle-win7-intel-float',
-      perf_output_basedir=perf_output_basedir_windows,
-      compile_bot_warnings_as_errors=False)
-
-  # Special-purpose Win7 builders
-  defaults['category'] = 'Win7-Special'
-  MakeBuilderSet(
-      helper=helper,
-      builder_base_name='Skia_Shuttle_Win7_Intel_Float_ANGLE_%s_32',
-      do_upload_results=do_upload_results,
-      target_platform=skia_factory.TARGET_PLATFORM_WIN32,
-      environment_variables=
-          {'GYP_DEFINES': ('skia_scalar=float skia_angle=1 skia_arch_width=32 '
-                           'skia_win_debuggers_path=c:/DbgHelp')},
-      gm_image_subdir='base-shuttle-win7-intel-angle',
-      perf_output_basedir=perf_output_basedir_windows,
-      gm_args=['--config', 'angle'],
-      bench_args=['--config', 'ANGLE'],
-      bench_pictures_cfg='angle')
-  MakeBuilderSet(
-      helper=helper,
-      builder_base_name='Skia_Shuttle_Win7_Intel_Float_DirectWrite_%s_32',
-      do_upload_results=do_upload_results,
-      target_platform=skia_factory.TARGET_PLATFORM_WIN32,
-      environment_variables=
-          {'GYP_DEFINES':
-           ('skia_scalar=float skia_directwrite=1 skia_arch_width=32 '
-            'skia_win_debuggers_path=c:/DbgHelp')},
-      gm_image_subdir='base-shuttle-win7-intel-directwrite',
-      perf_output_basedir=perf_output_basedir_windows)
-
-  defaults['category'] = 'iOS'
-  MakeIOSBuilderSet(
-      helper=helper,
-      builder_base_name='Skia_iOS_%s_32',
-      do_upload_results=do_upload_results,
-      target_platform=skia_factory.TARGET_PLATFORM_MAC,
-      environment_variables={'GYP_DEFINES': 'skia_os=ios'},
-      gm_image_subdir=None,
-      perf_output_basedir=None,
-      do_debug=False,
-      do_release=False,
-      do_bench=False)
+  for compile_builder in builder_specs.keys():
+    factory_type = compile_builder[8]
+    factory_args = GetExtraFactoryArgs(compile_builder)
+    target_platform = compile_builder[9]
+    try:
+      arch_width_define = ARCH_TO_GYP_DEFINE[compile_builder[3]]
+    except KeyError:
+      raise Exception('Unknown arch type: %s' % compile_builder[3])
+    gyp_defines = compile_builder[4]
+    if arch_width_define:
+      if not gyp_defines:
+        gyp_defines = arch_width_define
+      else:
+        if 'skia_arch_width' in gyp_defines:
+          raise ValueError('Cannot define skia_arch_width; it is derived from '
+                           'the provided arch type.')
+        gyp_defines += ' ' + arch_width_define
+    defaults['category'] = ' Build'
+    MakeCompileBuilderSet(
+        helper=helper,
+        scheduler='skia_rel',
+        os=compile_builder[0],
+        compiler=compile_builder[1],
+        configuration=compile_builder[2],
+        target_arch=compile_builder[3],
+        extra_config=compile_builder[4],
+        environment_variables={'GYP_DEFINES': gyp_defines},
+        compile_warnings_as_errors=compile_builder[6],
+        factory_type=factory_type,
+        target_platform=target_platform,
+        **factory_args)
+    defaults['category'] = compile_builder[7]
+    for dependent_builder in builder_specs[compile_builder]:
+      if target_platform == skia_factory.TARGET_PLATFORM_LINUX:
+        perf_output_basedir = perf_output_basedir_linux
+      elif target_platform == skia_factory.TARGET_PLATFORM_MAC:
+        perf_output_basedir = perf_output_basedir_mac
+      elif target_platform == skia_factory.TARGET_PLATFORM_WIN32:
+        perf_output_basedir = perf_output_basedir_windows
+      MakeBuilderSet(
+          helper=helper,
+          role=dependent_builder[0],
+          os=dependent_builder[1],
+          model=dependent_builder[2],
+          gpu=dependent_builder[3],
+          extra_config=dependent_builder[4],
+          configuration=compile_builder[2],
+          arch=compile_builder[3],
+          environment_variables={'GYP_DEFINES': gyp_defines},
+          factory_type=factory_type,
+          target_platform=target_platform,
+          gm_image_subdir=dependent_builder[5],
+          do_upload_results=do_upload_results,
+          perf_output_basedir=perf_output_basedir,
+          compile_warnings_as_errors=False,
+          **factory_args)
 
   # House Keeping
   defaults['category'] = '  Housekeeping'
-  MakeHousekeeperBuilderSet(
-      helper=helper,
-      do_trybots=True,
-      do_upload_results=do_upload_results)
+  builder_factory_scheduler = [
+    # The Percommit housekeeper
+    (utils.MakeBuilderName(role='Housekeeper', frequency='PerCommit'),
+     housekeeping_percommit_factory.HouseKeepingPerCommitFactory,
+     'skia_rel'),
+    # The Periodic housekeeper
+    (utils.MakeBuilderName(role='Housekeeper', frequency='Nightly'),
+     housekeeping_periodic_factory.HouseKeepingPeriodicFactory,
+     'skia_periodic'),
+  ]
+  # Add the corresponding trybot builders to the above list.
+  builder_factory_scheduler.extend([
+      (builder + utils.BUILDER_NAME_SEP + utils.TRYBOT_NAME_SUFFIX, factory,
+       utils.TRY_SCHEDULERS_STR)
+      for (builder, factory, _scheduler) in builder_factory_scheduler])
 
-  # "Special" bots, running on Linux
-  defaults['category'] = 'Linux-Special'
-  MakeBuilderSet(
-      helper=helper,
-      builder_base_name='Skia_Linux_NoGPU_%s_32',
-      do_upload_results=do_upload_results,
-      target_platform=skia_factory.TARGET_PLATFORM_LINUX,
-      environment_variables=
-          {'GYP_DEFINES': 'skia_scalar=float skia_gpu=0 skia_arch_width=64'},
-      gm_image_subdir='base-shuttle_ubuntu12_ati5770',
-      perf_output_basedir=None, # no perf measurement for debug builds
-      bench_pictures_cfg='no_gpu',
-      do_release=False,
-      do_bench=False)
+  for (builder_name, factory, scheduler) in builder_factory_scheduler:
+    helper.Builder(builder_name, 'f_%s' % builder_name, scheduler=scheduler)
+    helper.Factory('f_%s' % builder_name,
+      factory(
+        do_upload_results=do_upload_results,
+        target_platform=skia_factory.TARGET_PLATFORM_LINUX,
+        builder_name=builder_name,
+        do_patch_step=(scheduler == utils.TRY_SCHEDULERS_STR),
+      ).Build())
 
-  MakeNaClBuilderSet(
-      helper=helper,
-      builder_base_name='Skia_Shuttle_Ubuntu12_NaCl_%s',
-      do_upload_results=do_upload_results,
-      target_platform=skia_factory.TARGET_PLATFORM_LINUX,
-      gm_image_subdir=None,
-      perf_output_basedir=None,
-      do_debug=False,
-      do_release=False,
-      do_bench=False)
-
-  # Chrome OS
-  defaults['category'] = 'ChromeOS'
-  MakeChromeOSBuilderSet(
-      helper=helper,
-      builder_base_name='Skia_ChromeOS_Alex_%s_32',
-      do_upload_results=do_upload_results,
-      target_platform=skia_factory.TARGET_PLATFORM_LINUX,
-      environment_variables=
-          {'GYP_DEFINES': 'skia_arch_width=32 skia_gpu=0'},
-      gm_image_subdir=None,
-      perf_output_basedir=perf_output_basedir_linux,
-      bench_pictures_cfg='no_gpu')
-
-  return helper.Update(c)
+  return helper.Update(cfg)