| Index: masters/master.chromium.webkit/master_gpu_latest_cfg.py
|
| diff --git a/masters/master.chromium.webkit/master_gpu_latest_cfg.py b/masters/master.chromium.webkit/master_gpu_latest_cfg.py
|
| deleted file mode 100644
|
| index cab54742f34b0b57df8b81dd1c49329f3e133165..0000000000000000000000000000000000000000
|
| --- a/masters/master.chromium.webkit/master_gpu_latest_cfg.py
|
| +++ /dev/null
|
| @@ -1,169 +0,0 @@
|
| -# Copyright 2013 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.
|
| -
|
| -
|
| -from master import master_config
|
| -from master.factory import annotator_factory
|
| -
|
| -import collections
|
| -
|
| -defaults = {}
|
| -
|
| -helper = master_config.Helper(defaults)
|
| -B = helper.Builder
|
| -F = helper.Factory
|
| -T = helper.Triggerable
|
| -
|
| -# TODO(kbr): it would be better if this waterfall were refactored so
|
| -# that we could access the slaves_list here.
|
| -gpu_slave_info = [
|
| - {
|
| - 'builder': 'GPU Win Builder',
|
| - 'factory_id': 'f_gpu_win_builder_rel',
|
| - 'recipe': 'gpu/build_and_upload',
|
| - 'build_config': 'Release',
|
| - },
|
| - {
|
| - 'builder': 'GPU Win Builder (dbg)',
|
| - 'factory_id': 'f_gpu_win_builder_dbg',
|
| - 'recipe': 'gpu/build_and_upload',
|
| - 'build_config': 'Debug',
|
| - },
|
| - {
|
| - 'builder': 'GPU Win7 (NVIDIA)',
|
| - 'factory_id': 'f_gpu_win_rel',
|
| - 'recipe': 'gpu/download_and_test',
|
| - 'build_config': 'Release',
|
| - 'perf_id': 'gpu-webkit-win7-nvidia',
|
| - 'triggered_by': 'GPU Win Builder',
|
| - 'auto_reboot': False,
|
| - },
|
| - {
|
| - 'builder': 'GPU Win7 (dbg) (NVIDIA)',
|
| - 'factory_id': 'f_gpu_win_dbg',
|
| - 'recipe': 'gpu/download_and_test',
|
| - 'build_config': 'Debug',
|
| - 'triggered_by': 'GPU Win Builder (dbg)',
|
| - 'auto_reboot': False,
|
| - },
|
| - {
|
| - 'builder': 'GPU Mac Builder',
|
| - 'factory_id': 'f_gpu_mac_builder_rel',
|
| - 'recipe': 'gpu/build_and_upload',
|
| - 'build_config': 'Release',
|
| - },
|
| - {
|
| - 'builder': 'GPU Mac Builder (dbg)',
|
| - 'factory_id': 'f_gpu_mac_builder_dbg',
|
| - 'recipe': 'gpu/build_and_upload',
|
| - 'build_config': 'Debug',
|
| - },
|
| - {
|
| - 'builder': 'GPU Mac 10.9 (Intel)',
|
| - 'factory_id': 'f_gpu_mac_10_9_rel',
|
| - 'recipe': 'gpu/download_and_test',
|
| - 'build_config': 'Release',
|
| - 'perf_id': 'gpu-webkit-mac',
|
| - 'triggered_by': 'GPU Mac Builder',
|
| - },
|
| - {
|
| - 'builder': 'GPU Mac 10.9 (Intel) (dbg)',
|
| - 'factory_id': 'f_gpu_mac_10_9_dbg',
|
| - 'recipe': 'gpu/download_and_test',
|
| - 'build_config': 'Debug',
|
| - 'triggered_by': 'GPU Mac Builder (dbg)',
|
| - },
|
| - {
|
| - 'builder': 'GPU Linux Builder',
|
| - 'factory_id': 'f_gpu_linux_builder_rel',
|
| - 'recipe': 'gpu/build_and_upload',
|
| - 'build_config': 'Release',
|
| - },
|
| - {
|
| - 'builder': 'GPU Linux Builder (dbg)',
|
| - 'factory_id': 'f_gpu_linux_builder_dbg',
|
| - 'recipe': 'gpu/build_and_upload',
|
| - 'build_config': 'Debug',
|
| - },
|
| - {
|
| - 'builder': 'GPU Linux (NVIDIA)',
|
| - 'factory_id': 'f_gpu_linux_rel',
|
| - 'recipe': 'gpu/download_and_test',
|
| - 'build_config': 'Release',
|
| - 'perf_id': 'gpu-webkit-linux-nvidia',
|
| - 'triggered_by': 'GPU Linux Builder',
|
| - 'auto_reboot': False,
|
| - },
|
| - {
|
| - 'builder': 'GPU Linux (dbg) (NVIDIA)',
|
| - 'factory_id': 'f_gpu_linux_dbg',
|
| - 'recipe': 'gpu/download_and_test',
|
| - 'build_config': 'Debug',
|
| - 'triggered_by': 'GPU Linux Builder (dbg)',
|
| - 'auto_reboot': False,
|
| - },
|
| -]
|
| -
|
| -m_annotator = annotator_factory.AnnotatorFactory()
|
| -
|
| -defaults['category'] = 'gpu'
|
| -
|
| -# Maps the parent builder to a set of the names of the builders it triggers.
|
| -trigger_map = collections.defaultdict(list)
|
| -# Maps the name of the parent builder to the (synthesized) name of its
|
| -# trigger, wrapped in a list.
|
| -trigger_name_map = {}
|
| -next_group_id = 0
|
| -# Note this code is very similar to that in recipe_master_helper.py.
|
| -# Unfortunately due to the different structure of this waterfall it's
|
| -# impossible to share the code.
|
| -def BuilderExists(builder_name):
|
| - for s in gpu_slave_info:
|
| - if s['builder'] == builder_name:
|
| - return True
|
| - return False
|
| -
|
| -for slave in gpu_slave_info:
|
| - builder = slave['builder']
|
| - parent_builder = slave.get('triggered_by')
|
| - if parent_builder is not None:
|
| - if not BuilderExists(parent_builder):
|
| - raise Exception('Could not find parent builder %s for builder %s' %
|
| - (parent_builder, builder))
|
| - trigger_map[parent_builder].append(builder)
|
| - if parent_builder not in trigger_name_map:
|
| - trigger_name_map[parent_builder] = 'trigger_group_%d' % next_group_id
|
| - next_group_id += 1
|
| -
|
| -# Create triggers
|
| -for trigger_name in trigger_name_map.values():
|
| - T(trigger_name)
|
| -
|
| -# Set up bots
|
| -for slave in gpu_slave_info:
|
| - factory_properties = {
|
| - 'test_results_server': 'test-results.appspot.com',
|
| - 'generate_gtest_json': True,
|
| - 'build_config': slave['build_config'],
|
| - 'top_of_tree_blink': True
|
| - }
|
| - if 'perf_id' in slave:
|
| - factory_properties['show_perf_results'] = True
|
| - factory_properties['perf_id'] = slave['perf_id']
|
| - name = slave['builder']
|
| - scheduler = 'global_scheduler'
|
| - if 'triggered_by' in slave:
|
| - scheduler = trigger_name_map[slave['triggered_by']]
|
| - # The default for auto_reboot should match the setting in
|
| - # master_config.py.
|
| - auto_reboot = slave.get('auto_reboot', True)
|
| - B(name, slave['factory_id'], scheduler=scheduler, auto_reboot=auto_reboot)
|
| - F(slave['factory_id'], m_annotator.BaseFactory(
|
| - slave['recipe'],
|
| - factory_properties,
|
| - [trigger_name_map[name]] if name in trigger_name_map else None))
|
| -
|
| -
|
| -def Update(_config, _active_master, c):
|
| - return helper.Update(c)
|
|
|