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.
 
 from skia_master_scripts import factory as skia_factory
 from skia_master_scripts import utils
 from skia_master_scripts.utils import MakeBuilderSet, \
                                       MakeAndroidBuilderSet, \
@@ skipping 37 matching lines @@
   #
   # 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',
+      os='Ubuntu',
+      version='12',
+      arch_width='32',
+      hardware='ATI5770',

[epoger, 2013/04/19 16:25:44]

If we just use a single "hardware" field, then that field has to communicate all
of the following:
1. GPU type
2. CPU type
3. motherboard / support chipset
4. memory / hard drive / other components

Personally, I think the best way to handle this info is to split out the GPU
type, and use a single hardware ID to imply the rest.  For example:
host=ShuttleA  gpu=ATI5770

I can imagine situations where new hardware revisions come into play, like we
can't order the exact same parts and now we have "ShuttleB" systems.  At least
we'll be able to distinguish between them if we see differences.

As for the MacMini, I renew my previous proposal to use the identifiers from
http://en.wikipedia.org/wiki/Mac_Mini#Specifications_3 ("Macmini4,1", etc.).  In
that case, the particular Macmini hardware flavor implies the GPU type.
host=Macmini4,1  gpu=builtin

And I guess a Shuttle machine without a GPU card installed is:
host=ShuttleA  gpu=builtin

[borenet, 2013/04/22 16:29:55]

Done.

+      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)
+  MakeBuilderSet(
+      helper=helper,
+      os='Ubuntu',
+      version='12',
+      arch_width='64',
+      hardware='ATI5770',
       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)
 
   # 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',
+      version=None,

[borenet, 2013/04/17 17:50:15]

At Derek's suggestion, I excluded the Android version altogether.  The Android
bots will be kept up-to-date, and we don't want to have to rename the builders.

+      arch_width='32',
+      hardware='NexusS',
       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',
+      version=None,
+      arch_width='32',
+      hardware='Xoom',
       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',
+      version=None,
+      arch_width='32',
+      hardware='GalaxyNexus',
       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',
+      version=None,
+      arch_width='32',
+      hardware='Nexus4',
       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',
+      version=None,
+      arch_width='32',
+      hardware='Nexus7',
       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',
+      version=None,
+      arch_width='32',
+      hardware='Nexus10',
       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',
+      os='Android',
+      version=None,
+      arch_width='32',
+      hardware='RazrI',
       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)
 
   # Mac 10.6 (SnowLeopard) ...
   defaults['category'] = 'Mac-10.6'
   MakeBuilderSet(
       helper=helper,
-      builder_base_name='Skia_Mac_Float_%s_32',
+      os='OSX',
+      version='10_6',
+      arch_width='32',
+      hardware='MacMini',
       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',
+      os='OSX',
+      version='10_6',
+      arch_width='64',
+      hardware='MacMini',
       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',
+      os='OSX',
+      version='10_7',
+      arch_width='32',
+      hardware='MacMini',
       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',
+      os='OSX',
+      version='10_7',
+      arch_width='64',
+      hardware='MacMini',
       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',
+      os='OSX',
+      version='10_8',
+      arch_width='32',
+      hardware='MacMini',
       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',
+      os='OSX',
+      version='10_8',
+      arch_width='64',
+      hardware='MacMini',
       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',
+      os='Win',
+      version='7',
+      arch_width='32',
+      hardware='Intel',
       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',
+      os='Win',
+      version='7',
+      arch_width='64',
+      hardware='Intel',
       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',
+      os='Win',
+      version='7',
+      arch_width='32',
+      hardware='Intel',
+      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 '
                            '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='Win',
+      version='7',
+      arch_width='32',
+      hardware='Intel',
+      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')},
       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',
+      version='6',
+      arch_width='32',
+      hardware='iPhone',
       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)
 
   # 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='Ubuntu',
+      version='12',
+      arch_width='32',
+      hardware='NoGPU',
       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)
 
   MakeNaClBuilderSet(
       helper=helper,
-      builder_base_name='Skia_Shuttle_Ubuntu12_NaCl_%s',
+      os='Ubuntu',
+      version='12',
+      arch_width='32_64',
+      hardware='NaCl',
       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',
+      os='ChromeOS',
+      version=None,
+      arch_width='32',
+      hardware='Alex',
       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)