| OLD | NEW |
| 1 # -*- python -*- | 1 # -*- python -*- |
| 2 # ex: set syntax=python: | 2 # ex: set syntax=python: |
| 3 | 3 |
| 4 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 4 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 5 # Use of this source code is governed by a BSD-style license that can be | 5 # Use of this source code is governed by a BSD-style license that can be |
| 6 # found in the LICENSE file. | 6 # found in the LICENSE file. |
| 7 | 7 |
| 8 from buildbot.changes import svnpoller | 8 from buildbot.changes import svnpoller |
| 9 from buildbot.scheduler import Scheduler | 9 from buildbot.scheduler import Scheduler |
| 10 | 10 |
| 11 from master import build_utils | 11 from master import build_utils |
| 12 from master import gatekeeper | 12 from master import gatekeeper |
| 13 from master import chromium_step | 13 from master import chromium_step |
| 14 from master import master_utils | 14 from master import master_utils |
| 15 from master import slaves_list | 15 from master import slaves_list |
| 16 from master.factory import swarm_factory | 16 from master.factory import swarm_factory |
| 17 | 17 |
| 18 import config | 18 import config |
| 19 import master_site_config |
| 19 | 20 |
| 20 ActiveMaster = config.Master.ChromiumSwarm | 21 ActiveMaster = master_site_config.ChromiumSwarm |
| 21 | 22 |
| 22 # This is the dictionary that the buildmaster pays attention to. We also use | 23 # This is the dictionary that the buildmaster pays attention to. We also use |
| 23 # a shorter alias to save typing. | 24 # a shorter alias to save typing. |
| 24 c = BuildmasterConfig = {} | 25 c = BuildmasterConfig = {} |
| 25 | 26 |
| 26 # 'slavePortnum' defines the TCP port to listen on. This must match the value | 27 # 'slavePortnum' defines the TCP port to listen on. This must match the value |
| 27 # configured into the buildslaves (with their --master option) | 28 # configured into the buildslaves (with their --master option) |
| 28 c['slavePortnum'] = ActiveMaster.slave_port | 29 c['slavePortnum'] = ActiveMaster.slave_port |
| 29 | 30 |
| 30 config.DatabaseSetup(c, require_dbconfig=ActiveMaster.is_production_host) | 31 config.DatabaseSetup(c, require_dbconfig=ActiveMaster.is_production_host) |
| (...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 305 subject='chromium.swarm %(result)s in %(projectName)s ' | 306 subject='chromium.swarm %(result)s in %(projectName)s ' |
| 306 'on %(builder)s', | 307 'on %(builder)s', |
| 307 extraRecipients=['csharp@chromium.org', 'maruel@chromium.org'], | 308 extraRecipients=['csharp@chromium.org', 'maruel@chromium.org'], |
| 308 sendToInterestedUsers=False)) | 309 sendToInterestedUsers=False)) |
| 309 | 310 |
| 310 ####### PROJECT IDENTITY | 311 ####### PROJECT IDENTITY |
| 311 | 312 |
| 312 c['projectName'] = ActiveMaster.project_name | 313 c['projectName'] = ActiveMaster.project_name |
| 313 c['projectURL'] = config.Master.project_url | 314 c['projectURL'] = config.Master.project_url |
| 314 c['buildbotURL'] = 'http://build.chromium.org/p/chromium.swarm/' | 315 c['buildbotURL'] = 'http://build.chromium.org/p/chromium.swarm/' |
| OLD | NEW |