Change Builder Names, MkII

Change Builder Names, MkII

This takes a different approach from https://codereview.chromium.org/13861012/
- Each builder has a role: Compile, Test, Perf, Housekeeper
- The attributes contained in the builder name depend on its role.
- Compile builders are separated from the others.

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

https://codereview.chromium.org/14475006/diff/1/master/master_builders_cfg.py
File master/master_builders_cfg.py (right):

https://codereview.chromium.org/14475006/diff/1/master/master_builders_cfg.py...
master/master_builders_cfg.py:61: 
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.

https://codereview.chromium.org/14475006/diff/1/master/master_builders_cfg.py...
master/master_builders_cfg.py:67: compiler='GCC',
We should double-check the compilers.

https://codereview.chromium.org/14475006/diff/1/master/master_builders_cfg.py...
master/master_builders_cfg.py:71: environment_variables={'GYP_DEFINES':
'skia_arch_width=32'},
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.

https://codereview.chromium.org/14475006/diff/1/master/master_builders_cfg.py...
master/master_builders_cfg.py:120: target_arch='64',
This field could have a lot more detail, eg. "amd64" or "x86-64" for desktop,
and "arm32_neon" for Android...

https://codereview.chromium.org/14475006/diff/1/master/master_builders_cfg.py...
master/master_builders_cfg.py:154: extra_config='NexusS',
I chose to specify the device name in extra_config.  Alternatively, it could be
part of target_arch, which makes a lot of sense.

https://codereview.chromium.org/14475006/diff/1/master/master_builders_cfg.py...
master/master_builders_cfg.py:590: environment_variables={'GYP_DEFINES':
'skia_arch_width=64'},
skia_scalar=float is never needed. I removed all occurrences, along with other
defines which aren't required, like skia_mesa=0.

https://codereview.chromium.org/14475006/diff/1/master/master_builders_cfg.py...
master/master_builders_cfg.py:832: do_bench=False)
This MakeBuilderSet is no longer needed, since iOS is compile-only right now. 
Will remove in the next patch set.

https://codereview.chromium.org/14475006/diff/1/master/master_builders_cfg.py...
master/master_builders_cfg.py:866:
target_platform=skia_factory.TARGET_PLATFORM_LINUX,
Looks like I missed adding target_platform for the compile builders.  I'll add
that in patch set 2.

https://codereview.chromium.org/14475006/diff/1/master/master_builders_cfg.py...
master/master_builders_cfg.py:871: do_bench=False)
This MakeBuilderSet is no longer needed, since NaCl is compile-only right now. 
Will remove in the next patch set.

https://codereview.chromium.org/14475006/diff/1/master/skia_master_scripts/fa...
File master/skia_master_scripts/factory.py (left):

https://codereview.chromium.org/14475006/diff/1/master/skia_master_scripts/fa...
master/skia_master_scripts/factory.py:33: CONFIG_BENCH = 'Bench'
'Bench' isn't a valid config.

https://codereview.chromium.org/14475006/diff/1/master/skia_master_scripts/ut...
File master/skia_master_scripts/utils.py (left):

https://codereview.chromium.org/14475006/diff/1/master/skia_master_scripts/ut...
master/skia_master_scripts/utils.py:220: if override_category:
No longer needed, since compile builders are specified separately.

https://codereview.chromium.org/14475006/diff/1/master/skia_master_scripts/ut...
File master/skia_master_scripts/utils.py (right):

https://codereview.chromium.org/14475006/diff/1/master/skia_master_scripts/ut...
master/skia_master_scripts/utils.py:52: BUILDER_ROLE_HOUSEKEEPER: ['frequency'],
extra_config and the trybot suffix are implied for all roles.

https://codereview.chromium.org/14475006/diff/1/master/slaves.cfg
File master/slaves.cfg (right):

https://codereview.chromium.org/14475006/diff/1/master/slaves.cfg#newcode92
master/slaves.cfg:92: for builder in slave_dict['builder']])
This vastly reduces the amount of work I have to do when I rename a bunch of
builders.

[borenet, 2013-04-24 15:05:22]

This is running here: http://nautilus.cnc.corp.google.com:10115/builders

[borenet, 2013-04-24 15:52:41]

Uploaded patch set 2.

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

Nice at patchset 2!

Just one suggestion of significance...

https://codereview.chromium.org/14475006/diff/5001/master/master_builders_cfg.py
File master/master_builders_cfg.py (right):

https://codereview.chromium.org/14475006/diff/5001/master/master_builders_cfg...
master/master_builders_cfg.py:61: MakeCompileBuilderSet(
Maybe you could compress the builder declaration section by adding a layer to
the helper functions, so that they can build a "set of sets"?

For example, this would cover all of the Linux compile-only builders:

MakeCompileBuilderSetMatrix(
  os_list=['Ubuntu12'],
  compiler_list=['GCC'],
  configuration_list=[
    skia_factory.CONFIG_DEBUG,
    skia_factory.CONFIG_RELEASE,
  ],
  target_arch_list=['32', '64'],

  # the following must be the same for all builders in the matrix
  helper=helper,
  scheduler='skia_rel',
  factory_type=skia_factory.SkiaFactory,
  target_platform=skia_factory.TARGET_PLATFORM_LINUX,
)

MakeCompileBuilderSetMatrix(
  os_list=['Ubuntu12'],
  compiler_list=['GCC'],
  configuration_list=[
    skia_factory.CONFIG_DEBUG,
    skia_factory.CONFIG_RELEASE,
  ],
  target_arch_list=['64'],

  # the following must be the same for all builders in the matrix
  helper=helper,
  scheduler='skia_rel',
  factory_type=skia_factory.SkiaFactory,
  target_platform=skia_factory.TARGET_PLATFORM_LINUX,
  extra_config='NoGPU',
  add_to_gyp_defines='skia_gpu=0',
)


It could be even shorter if various items were set to their common value by
default:

helper=helper,
scheduler='skia_rel',
factory_type=skia_factory.SkiaFactory,
configuration_list = [skia_factory.CONFIG_DEBUG, skia_factory.CONFIG_RELEASE],
target_arch_list=['32', '64'],

https://codereview.chromium.org/14475006/diff/5001/master/master_builders_cfg...
master/master_builders_cfg.py:625: os='Ubuntu12',
[similar matrix factory idea as proposed above]

https://codereview.chromium.org/14475006/diff/5001/master/skia_master_scripts...
File master/skia_master_scripts/utils.py (right):

https://codereview.chromium.org/14475006/diff/5001/master/skia_master_scripts...
master/skia_master_scripts/utils.py:45: BUILDER_ROLE_HOUSEKEEPER = 'Housekeeper'
ideas for shorter name:  House, Tasks, Other

https://codereview.chromium.org/14475006/diff/5001/master/skia_master_scripts...
master/skia_master_scripts/utils.py:382: schema = BUILDER_NAME_SCHEMA.get(role)
I like how you did this!  The Python force is strong with this one.

https://codereview.chromium.org/14475006/diff/5001/master/slaves.cfg
File master/slaves.cfg (right):

https://codereview.chromium.org/14475006/diff/5001/master/slaves.cfg#newcode23
master/slaves.cfg:23: 'Build-Ubuntu12-GCC-Debug-32',
So much cleaner!!!

[epoger, 2013-04-24 19:13:14]

LGTM as discussed in person

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

Lets also update all existing builder name references in buildbot code in this
CL, doing a search for 'Skia_' should hopefully get you the builder names.


Ben, what do you think of the names so far?
Also, how long would it take you to update your code when this is ready to go
in?

https://codereview.chromium.org/14475006/diff/5001/master/master_builders_cfg.py
File master/master_builders_cfg.py (right):

https://codereview.chromium.org/14475006/diff/5001/master/master_builders_cfg...
master/master_builders_cfg.py:58: defaults['category'] = ' Build'
Rename to ' Compile' or ' Compilers' ?

https://codereview.chromium.org/14475006/diff/5001/master/master_builders_cfg...
master/master_builders_cfg.py:72: MakeCompileBuilderSet(
You could do some serious compression here by looping through tuples, something
like this:

# Contains tuples of (OS, compiler, bit, ....)
compilebot_specs = [
  # Linux
  ('Ubuntu12', 'GCC', '32', target_platform, extra_config),
  ...
  # Android
  ...
]

for compilebot_spec in compilebot_specs:
  MakeCompileBuilderSet(.......)

It will be more readable and may save you a 100 of so lines.

https://codereview.chromium.org/14475006/diff/5001/master/master_builders_cfg...
master/master_builders_cfg.py:623: MakeBuilderSet(
Could do the same tuple looping here as above for each category.

https://codereview.chromium.org/14475006/diff/5001/master/skia_master_scripts...
File master/skia_master_scripts/utils.py (right):

https://codereview.chromium.org/14475006/diff/5001/master/skia_master_scripts...
master/skia_master_scripts/utils.py:548: return device.replace('_', '
').title().replace(' ', '')
Lets add a short comment here, something like:
# 'Nexus_s' is converted to 'NexusS'

https://codereview.chromium.org/14475006/diff/5001/master/slaves.cfg
File master/slaves.cfg (right):

https://codereview.chromium.org/14475006/diff/5001/master/slaves.cfg#newcode320
master/slaves.cfg:320: 'Test-Mac10.6-MacMini4.1-GeForce320M-Release-64',
Yaay for no commas!

[benchen, 2013-04-25 13:42:21]

All look fine to me. Just wonder how this change should collaborate with code
changes under trunk/bench. Ideally they should be in one CL.

Is it possible to add trunk/bench/bench_graph_svg.py and gen_skp_ranges.py into
this CL? If so I can write code changes in comments for Eric to incorporate into
this CL. This will take care of the AppEngine uploads.

As to the MySQL related scripts, I'll start changing codes so they work for both
old and new names as preparation for the transition. Will let you know when
ready.

Once new data appear and we stop generating old ones, I'll start changing
datastore/MySQL data.