Change Builder Names, MkII

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.
 
 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 ios_factory
+from skia_master_scripts import nacl_factory
 from skia_master_scripts import utils
 from skia_master_scripts.utils import MakeBuilderSet, \
                                       MakeAndroidBuilderSet, \
+                                      MakeCompileBuilderSet, \
                                       MakeChromeOSBuilderSet, \
                                       MakeIOSBuilderSet, \
                                       MakeHousekeeperBuilderSet, \
                                       MakeNaClBuilderSet
 
 # 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'
@@ skipping 23 matching lines @@
   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
 
+  # Compile-only builders.
+  defaults['category'] = ' Build'
+

[borenet, 2013/04/24 15:02:38]

Note that I could have grouped Debug/Release and 32/64 for the Compile builders.
 I did not, because I eventually want MakeCompileBuilderSet to return the name
of the builder created, so that it can be passed in to MakeBuilderSet for the
builders which depend on it.

+  # Linux
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Ubuntu12',
+      compiler='GCC',

[borenet, 2013/04/24 15:02:38]

We should double-check the compilers.

+      configuration=skia_factory.CONFIG_DEBUG,
+      target_arch='32',
+      factory_type=skia_factory.SkiaFactory,
+      environment_variables={'GYP_DEFINES': 'skia_arch_width=32'},

[borenet, 2013/04/24 15:02:38]

Please help me verify that I have configured the new compile builders the same
way as the old ones, with particular attention toward GYP_DEFINES.

+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Ubuntu12',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_RELEASE,
+      target_arch='32',
+      factory_type=skia_factory.SkiaFactory,
+      environment_variables={'GYP_DEFINES': 'skia_arch_width=32'},
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Ubuntu12',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_DEBUG,
+      target_arch='64',
+      factory_type=skia_factory.SkiaFactory,
+      environment_variables={'GYP_DEFINES': 'skia_arch_width=64'},
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Ubuntu12',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_RELEASE,
+      target_arch='64',
+      factory_type=skia_factory.SkiaFactory,
+      environment_variables={'GYP_DEFINES': 'skia_arch_width=64'},
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Ubuntu12',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_DEBUG,
+      target_arch='64',
+      extra_config='NoGPU',
+      factory_type=skia_factory.SkiaFactory,
+      environment_variables={'GYP_DEFINES': 'skia_gpu=0 skia_arch_width=64'},
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Ubuntu12',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_RELEASE,
+      target_arch='64',

[borenet, 2013/04/24 15:02:38]

This field could have a lot more detail, eg. "amd64" or "x86-64" for desktop,
and "arm32_neon" for Android...

+      extra_config='NoGPU',
+      factory_type=skia_factory.SkiaFactory,
+      environment_variables={'GYP_DEFINES': 'skia_gpu=0 skia_arch_width=64'},
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Ubuntu12',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_DEBUG,
+      target_arch='32,64',
+      extra_config='NaCl',
+      factory_type=nacl_factory.NaClFactory,
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Ubuntu12',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_RELEASE,
+      target_arch='32,64',
+      extra_config='NaCl',
+      factory_type=nacl_factory.NaClFactory,
+      compile_warnings_as_errors=True)
+
+  # Android
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Ubuntu12',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_DEBUG,
+      target_arch='32',
+      extra_config='NexusS',

[borenet, 2013/04/24 15:02:38]

I chose to specify the device name in extra_config.  Alternatively, it could be
part of target_arch, which makes a lot of sense.

+      device='nexus_s',
+      factory_type=android_factory.AndroidFactory,
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Ubuntu12',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_RELEASE,
+      target_arch='32',
+      extra_config='NexusS',
+      device='nexus_s',
+      factory_type=android_factory.AndroidFactory,
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Ubuntu12',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_DEBUG,
+      target_arch='32',
+      extra_config='Nexus4',
+      device='nexus_4',
+      factory_type=android_factory.AndroidFactory,
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Ubuntu12',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_RELEASE,
+      target_arch='32',
+      extra_config='Nexus4',
+      device='nexus_4',
+      factory_type=android_factory.AndroidFactory,
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Ubuntu12',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_DEBUG,
+      target_arch='32',
+      extra_config='Nexus7',
+      device='nexus_7',
+      factory_type=android_factory.AndroidFactory,
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Ubuntu12',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_RELEASE,
+      target_arch='32',
+      extra_config='Nexus7',
+      device='nexus_7',
+      factory_type=android_factory.AndroidFactory,
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Ubuntu12',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_DEBUG,
+      target_arch='32',
+      extra_config='Nexus10',
+      device='nexus_10',
+      factory_type=android_factory.AndroidFactory,
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Ubuntu12',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_RELEASE,
+      target_arch='32',
+      extra_config='Nexus10',
+      device='nexus_10',
+      factory_type=android_factory.AndroidFactory,
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Ubuntu12',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_DEBUG,
+      target_arch='32',
+      extra_config='Xoom',
+      device='xoom',
+      factory_type=android_factory.AndroidFactory,
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Ubuntu12',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_RELEASE,
+      target_arch='32',
+      extra_config='Xoom',
+      device='xoom',
+      factory_type=android_factory.AndroidFactory,
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Ubuntu12',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_DEBUG,
+      target_arch='32',
+      extra_config='GalaxyNexus',
+      device='galaxy_nexus',
+      factory_type=android_factory.AndroidFactory,
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Ubuntu12',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_RELEASE,
+      target_arch='32',
+      extra_config='GalaxyNexus',
+      device='galaxy_nexus',
+      factory_type=android_factory.AndroidFactory,
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Ubuntu12',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_DEBUG,
+      target_arch='32',
+      extra_config='RazrI',
+      device='razr_i',
+      factory_type=android_factory.AndroidFactory,
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Ubuntu12',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_RELEASE,
+      target_arch='32',
+      extra_config='RazrI',
+      device='razr_i',
+      factory_type=android_factory.AndroidFactory,
+      compile_warnings_as_errors=True)
+
+  # ChromeOS
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Ubuntu12',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_DEBUG,
+      target_arch='32',
+      extra_config='ChromeOS',
+      factory_type=chromeos_factory.ChromeOSFactory,
+      environment_variables={'GYP_DEFINES': 'skia_arch_width=32 skia_gpu=0'},
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Ubuntu12',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_RELEASE,
+      target_arch='32',
+      extra_config='ChromeOS',
+      factory_type=chromeos_factory.ChromeOSFactory,
+      environment_variables={'GYP_DEFINES': 'skia_arch_width=32 skia_gpu=0'},
+      compile_warnings_as_errors=True)
+
+  # Mac
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Mac10.6',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_DEBUG,
+      target_arch='32',
+      factory_type=skia_factory.SkiaFactory,
+      environment_variables=
+          {'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_arch_width=32'},
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Mac10.6',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_RELEASE,
+      target_arch='32',
+      factory_type=skia_factory.SkiaFactory,
+      environment_variables=
+          {'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_arch_width=32'},
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Mac10.6',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_DEBUG,
+      target_arch='64',
+      factory_type=skia_factory.SkiaFactory,
+      environment_variables=
+          {'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_arch_width=64'},
+      compile_warnings_as_errors=False)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Mac10.6',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_RELEASE,
+      target_arch='64',
+      factory_type=skia_factory.SkiaFactory,
+      environment_variables=
+          {'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_arch_width=64'},
+      compile_warnings_as_errors=False)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Mac10.7',
+      compiler='Clang',
+      configuration=skia_factory.CONFIG_DEBUG,
+      target_arch='32',
+      factory_type=skia_factory.SkiaFactory,
+      environment_variables={'GYP_DEFINES': 'skia_mesa=1 skia_arch_width=32'},
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Mac10.7',
+      compiler='Clang',
+      configuration=skia_factory.CONFIG_RELEASE,
+      target_arch='32',
+      factory_type=skia_factory.SkiaFactory,
+      environment_variables={'GYP_DEFINES': 'skia_mesa=1 skia_arch_width=32'},
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Mac10.7',
+      compiler='Clang',
+      configuration=skia_factory.CONFIG_DEBUG,
+      target_arch='64',
+      factory_type=skia_factory.SkiaFactory,
+      environment_variables={'GYP_DEFINES': 'skia_mesa=1 skia_arch_width=64'},
+      compile_warnings_as_errors=False)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Mac10.7',
+      compiler='Clang',
+      configuration=skia_factory.CONFIG_RELEASE,
+      target_arch='64',
+      factory_type=skia_factory.SkiaFactory,
+      environment_variables={'GYP_DEFINES': 'skia_mesa=1 skia_arch_width=64'},
+      compile_warnings_as_errors=False)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Mac10.8',
+      compiler='Clang',
+      configuration=skia_factory.CONFIG_DEBUG,
+      target_arch='32',
+      factory_type=skia_factory.SkiaFactory,
+      environment_variables={'GYP_DEFINES': 'skia_arch_width=32'},
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Mac10.8',
+      compiler='Clang',
+      configuration=skia_factory.CONFIG_RELEASE,
+      target_arch='32',
+      factory_type=skia_factory.SkiaFactory,
+      environment_variables={'GYP_DEFINES': 'skia_arch_width=32'},
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Mac10.8',
+      compiler='Clang',
+      configuration=skia_factory.CONFIG_DEBUG,
+      target_arch='64',
+      factory_type=skia_factory.SkiaFactory,
+      environment_variables={'GYP_DEFINES': 'skia_arch_width=64'},
+      compile_warnings_as_errors=False)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Mac10.8',
+      compiler='Clang',
+      configuration=skia_factory.CONFIG_RELEASE,
+      target_arch='64',
+      factory_type=skia_factory.SkiaFactory,
+      environment_variables={'GYP_DEFINES': 'skia_arch_width=64'},
+      compile_warnings_as_errors=False)
+
+  # Windows
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Win7',
+      compiler='VS2010',
+      configuration=skia_factory.CONFIG_DEBUG,
+      target_arch='32',
+      factory_type=skia_factory.SkiaFactory,
+      environment_variables=
+          {'GYP_DEFINES': ('skia_arch_width=32 '
+                           'skia_win_debuggers_path=c:/DbgHelp')},
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Win7',
+      compiler='VS2010',
+      configuration=skia_factory.CONFIG_RELEASE,
+      target_arch='32',
+      factory_type=skia_factory.SkiaFactory,
+      environment_variables=
+          {'GYP_DEFINES': ('skia_arch_width=32 '
+                           'skia_win_debuggers_path=c:/DbgHelp')},
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Win7',
+      compiler='VS2010',
+      configuration=skia_factory.CONFIG_DEBUG,
+      target_arch='64',
+      factory_type=skia_factory.SkiaFactory,
+      environment_variables=
+          {'GYP_DEFINES': ('skia_arch_width=64 '
+                           'skia_win_debuggers_path=c:/DbgHelp')},
+      compile_warnings_as_errors=False)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Win7',
+      compiler='VS2010',
+      configuration=skia_factory.CONFIG_RELEASE,
+      target_arch='64',
+      factory_type=skia_factory.SkiaFactory,
+      environment_variables=
+          {'GYP_DEFINES': ('skia_arch_width=64 '
+                           'skia_win_debuggers_path=c:/DbgHelp')},
+      compile_warnings_as_errors=False)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Win7',
+      compiler='VS2010',
+      configuration=skia_factory.CONFIG_DEBUG,
+      target_arch='32',
+      extra_config='ANGLE',
+      factory_type=skia_factory.SkiaFactory,
+      environment_variables=
+          {'GYP_DEFINES': ('skia_angle=1 skia_arch_width=32 '
+                           'skia_win_debuggers_path=c:/DbgHelp')},
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Win7',
+      compiler='VS2010',
+      configuration=skia_factory.CONFIG_RELEASE,
+      target_arch='32',
+      extra_config='ANGLE',
+      factory_type=skia_factory.SkiaFactory,
+      environment_variables=
+          {'GYP_DEFINES': ('skia_angle=1 skia_arch_width=32 '
+                           'skia_win_debuggers_path=c:/DbgHelp')},
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Win7',
+      compiler='VS2010',
+      configuration=skia_factory.CONFIG_DEBUG,
+      target_arch='32',
+      extra_config='DirectWrite',
+      factory_type=skia_factory.SkiaFactory,
+      environment_variables=
+          {'GYP_DEFINES': ('skia_directwrite=1 skia_arch_width=32 '
+                           'skia_win_debuggers_path=c:/DbgHelp')},
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Win7',
+      compiler='VS2010',
+      configuration=skia_factory.CONFIG_RELEASE,
+      target_arch='32',
+      extra_config='DirectWrite',
+      factory_type=skia_factory.SkiaFactory,
+      environment_variables=
+          {'GYP_DEFINES': ('skia_directwrite=1 skia_arch_width=32 '
+                           'skia_win_debuggers_path=c:/DbgHelp')},
+      compile_warnings_as_errors=True)
+
+  # iOS
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Mac10.7',
+      compiler='Clang',
+      configuration=skia_factory.CONFIG_DEBUG,
+      target_arch='32',
+      extra_config='iOS',
+      factory_type=ios_factory.iOSFactory,
+      environment_variables={'GYP_DEFINES': 'skia_os=ios'},
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Mac10.7',
+      compiler='Clang',
+      configuration=skia_factory.CONFIG_RELEASE,
+      target_arch='32',
+      extra_config='iOS',
+      factory_type=ios_factory.iOSFactory,
+      environment_variables={'GYP_DEFINES': 'skia_os=ios'},
+      compile_warnings_as_errors=True)
+
+  # Builders which run a full set of BuildSteps
+
   # Linux (Ubuntu12) on Shuttle with ATI5770 graphics card
   defaults['category'] = 'Linux'
   MakeBuilderSet(
       helper=helper,
-      builder_base_name='Skia_Shuttle_Ubuntu12_ATI5770_Float_%s_64',
+      os='Ubuntu12',
+      model='ShuttleA',
+      gpu='ATI5770',
+      arch_width='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'},
+      environment_variables={'GYP_DEFINES': 'skia_arch_width=64'},

[borenet, 2013/04/24 15:02:38]

skia_scalar=float is never needed. I removed all occurrences, along with other
defines which aren't required, like skia_mesa=0.

       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',
+      os='Ubuntu12',
+      model='ShuttleA',
+      gpu='ATI5770',
+      arch_width='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'},
+      environment_variables={'GYP_DEFINES': 'skia_arch_width=32'},
       gm_image_subdir='base-shuttle_ubuntu12_ati5770',
       perf_output_basedir=perf_output_basedir_linux)
 
   # Android (runs on a Linux buildbot slave)...
   defaults['category'] = 'Android'
   MakeAndroidBuilderSet(
       helper=helper,
-      builder_base_name='Skia_NexusS_4-1_Float_%s_32',
+      os='Android',
+      gpu='SGX540',
+      arch_width='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',
+      os='Android',
+      gpu='Tegra2',
+      arch_width='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',
+      os='Android',
+      gpu='SGX540',
+      arch_width='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',
+      os='Android',
+      gpu='Adreno320',
+      arch_width='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',
+      os='Android',
+      gpu='Tegra3',
+      arch_width='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',
+      os='Android',
+      gpu='MaliT604',
+      arch_width='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',
+      os='Android',
+      gpu='SGX540',
+      arch_width='32',
+      device='razr_i',
       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)
 
   # Mac 10.6 (SnowLeopard) ...
   defaults['category'] = 'Mac-10.6'
   MakeBuilderSet(
       helper=helper,
-      builder_base_name='Skia_Mac_Float_%s_32',
+      os='Mac10.6',
+      model='MacMini4,1',
+      gpu='GeForce320M',
+      arch_width='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')},
+          {'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 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',
+      os='Mac10.6',
+      model='MacMini4,1',
+      gpu='GeForce320M',
+      arch_width='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')},
+          {'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_arch_width=64'},
       gm_image_subdir='base-macmini',
-      perf_output_basedir=perf_output_basedir_mac,
-      compile_bot_warnings_as_errors=False)
+      perf_output_basedir=perf_output_basedir_mac)
 
   # Mac 10.7 (Lion) ...
   defaults['category'] = 'Mac-10.7'
   MakeBuilderSet(
       helper=helper,
-      builder_base_name='Skia_MacMiniLion_Float_%s_32',
+      os='Mac10.7',
+      model='MacMini4,1',
+      gpu='GeForce320M',
+      arch_width='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'},
+      environment_variables={'GYP_DEFINES': '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',
+      os='Mac10.7',
+      model='MacMini4,1',
+      gpu='GeForce320M',
+      arch_width='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'},
+      environment_variables={'GYP_DEFINES': '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)
+      perf_output_basedir=perf_output_basedir_mac)
 
   # Mac 10.8 (Mountain Lion) ...
   defaults['category'] = 'Mac-10.8'
   MakeBuilderSet(
       helper=helper,
-      builder_base_name='Skia_MacMini_10_8_Float_%s_32',
+      os='Mac10.8',
+      model='MacMini4,1',
+      gpu='GeForce320M',
+      arch_width='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'},
+      environment_variables={'GYP_DEFINES': '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',
+      os='Mac10.8',
+      model='MacMini4,1',
+      gpu='GeForce320M',
+      arch_width='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'},
+      environment_variables={'GYP_DEFINES': 'skia_arch_width=64'},
       gm_image_subdir='base-macmini-10_8',
-      perf_output_basedir=perf_output_basedir_mac,
-      compile_bot_warnings_as_errors=False)
+      perf_output_basedir=perf_output_basedir_mac)
 
   # 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',
+      os='Win7',
+      model='ShuttleA',
+      gpu='HD2000',
+      arch_width='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 '
+          {'GYP_DEFINES': ('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',
+      os='Win7',
+      model='ShuttleA',
+      gpu='HD2000',
+      arch_width='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)
+      perf_output_basedir=perf_output_basedir_windows)
 
   # Special-purpose Win7 builders
   defaults['category'] = 'Win7-Special'
   MakeBuilderSet(
       helper=helper,
-      builder_base_name='Skia_Shuttle_Win7_Intel_Float_ANGLE_%s_32',
+      os='Win7',
+      model='ShuttleA',
+      gpu='HD2000',
+      arch_width='32',
+      extra_config='ANGLE',
       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 '
+          {'GYP_DEFINES': ('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',
+      os='Win7',
+      model='ShuttleA',
+      gpu='HD2000',
+      arch_width='32',
+      extra_config='DirectWrite',
       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')},
+          {'GYP_DEFINES': ('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',
+      os='iOS',
+      model='iPhone',
+      gpu='SGX543MP3',
+      arch_width='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)

[borenet, 2013/04/24 15:02:38]

This MakeBuilderSet is no longer needed, since iOS is compile-only right now. 
Will remove in the next patch set.

 
   # House Keeping
   defaults['category'] = '  Housekeeping'
   MakeHousekeeperBuilderSet(
       helper=helper,
       do_trybots=True,
       do_upload_results=do_upload_results)
 
   # "Special" bots, running on Linux
   defaults['category'] = 'Linux-Special'
   MakeBuilderSet(
       helper=helper,
-      builder_base_name='Skia_Linux_NoGPU_%s_32',
+      os='Ubuntu12',
+      model='ShuttleA',
+      gpu='NoGPU',
+      arch_width='64',
       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'},
+      environment_variables={'GYP_DEFINES': '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)
 
   MakeNaClBuilderSet(
       helper=helper,
-      builder_base_name='Skia_Shuttle_Ubuntu12_NaCl_%s',
+      os='Ubuntu12',
+      model='ShuttleA',
+      gpu='ATI5770',
+      arch_width='32,64',
+      extra_config='NaCl',
       do_upload_results=do_upload_results,
       target_platform=skia_factory.TARGET_PLATFORM_LINUX,

[borenet, 2013/04/24 15:02:38]

Looks like I missed adding target_platform for the compile builders.  I'll add
that in patch set 2.

       gm_image_subdir=None,
       perf_output_basedir=None,
       do_debug=False,
       do_release=False,
       do_bench=False)

[borenet, 2013/04/24 15:02:38]

This MakeBuilderSet is no longer needed, since NaCl is compile-only right now. 
Will remove in the next patch set.

 
   # Chrome OS
   defaults['category'] = 'ChromeOS'
   MakeChromeOSBuilderSet(
       helper=helper,
-      builder_base_name='Skia_ChromeOS_Alex_%s_32',
+      os='ChromeOS',
+      model='Alex',
+      gpu='GMA3150',
+      arch_width='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'},
+      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)