Chromium Code Reviews| Index: masters/master.client.webrtc.perf/master.cfg |
| diff --git a/masters/master.client.webrtc/master.cfg b/masters/master.client.webrtc.perf/master.cfg |
| similarity index 62% |
| copy from masters/master.client.webrtc/master.cfg |
| copy to masters/master.client.webrtc.perf/master.cfg |
| index b9a74806d96f66d1fa305c8bfb469ab866f4fc49..a7f813e3c14ccd04ee858ea7f85cda3ababbc151 100644 |
| --- a/masters/master.client.webrtc/master.cfg |
| +++ b/masters/master.client.webrtc.perf/master.cfg |
| @@ -1,14 +1,17 @@ |
| -# Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| +# Copyright 2016 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 buildbot.schedulers.basic import SingleBranchScheduler |
| + |
| # These modules come from scripts/master, which must be in the PYTHONPATH. |
| from master import master_utils |
| from master import slaves_list |
| +from master.factory import annotator_factory |
| import config |
| import master_site_config |
| -ActiveMaster = master_site_config.WebRTC |
| +ActiveMaster = master_site_config.WebRTCPerf |
| c = BuildmasterConfig = {} |
| c['change_source'] = [] |
| @@ -19,23 +22,51 @@ c['status'] = [] |
| config.DatabaseSetup(c, require_dbconfig=ActiveMaster.is_production_host) |
| import master_source_cfg |
| -import master_win_cfg |
| -import master_mac_cfg |
| -import master_linux_cfg |
| -import master_android_cfg |
| - |
| master_source_cfg.Update(config, c) |
| -master_win_cfg.Update(c) |
| -master_mac_cfg.Update(c) |
| -master_linux_cfg.Update(c) |
| -master_android_cfg.Update(c) |
| + |
| +####### BUILDERS |
| + |
| +c['schedulers'].extend([ |
|
ghost stip (do not use)
2016/06/01 18:43:49
you should look into using builders.pyl. it combin
|
| + SingleBranchScheduler(name='webrtc_scheduler', |
| + branch='master', |
| + treeStableTimer=0, |
| + builderNames=[ |
| + 'Android32 Builder', |
| + 'Android64 Builder', |
| + 'Linux Trusty', |
| + 'Mac 10.11', |
| + 'Win7', |
| + ]), |
| +]) |
| + |
| +specs = [ |
| + {'name': 'Android32 Builder', 'slavebuilddir': 'android_32'}, |
| + {'name': 'Android64 Builder', 'slavebuilddir': 'android_64'}, |
| + {'name': 'Android32 Tests (M Nexus5X)'}, |
| + {'name': 'Android64 Tests (M Nexus9)'}, |
| + {'name': 'Linux Trusty'}, |
| + {'name': 'Mac 10.11'}, |
| + {'name': 'Win7'}, |
| +] |
| + |
| +m_annotator = annotator_factory.AnnotatorFactory() |
| +for spec in specs: |
| + builder = { |
| + 'name': spec['name'], |
| + 'factory': m_annotator.BaseFactory('webrtc/standalone'), |
| + 'notify_on_missing': True, |
| + } |
| + if spec.get('slavebuilddir'): |
| + builder['slavebuilddir'] = spec.get('slavebuilddir') |
| + c['builders'].append(builder) |
| + |
| # Must come before AutoSetupMaster(). |
| c['buildbotURL'] = ActiveMaster.buildbot_url |
| # Associate the slaves to the manual builders. The configuration is in |
| # slaves.cfg. |
| -slaves = slaves_list.SlavesList('slaves.cfg', 'WebRTC') |
| +slaves = slaves_list.SlavesList('slaves.cfg', 'WebRTCPerf') |
| for builder in c['builders']: |
| builder['slavenames'] = slaves.GetSlavesName(builder=builder['name']) |
| # Disable auto_reboot when testing locally, but don't change for production. |
| @@ -52,7 +83,9 @@ master_utils.VerifySetup(c, slaves) |
| # Adds common status and tools to this master. |
| master_utils.AutoSetupMaster(c, ActiveMaster, |
| public_html='../master.chromium/public_html', |
| - templates=['./templates', '../master.chromium/templates'], |
| + templates=['./templates', |
| + '../master.client.webrtc/templates', |
| + '../master.chromium/templates'], |
| tagComparator=c['change_source'][0].comparator, |
| enable_http_status_push=ActiveMaster.is_production_host) |