| 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 import urlparse | 8 import urlparse |
| 9 | 9 |
| 10 from buildbot.scheduler import Periodic | 10 from buildbot.scheduler import Periodic |
| 11 | 11 |
| 12 from common import chromium_utils | 12 from common import chromium_utils |
| 13 from master import build_utils | 13 from master import build_utils |
| 14 from master import chromium_step | 14 from master import chromium_step |
| 15 from master import master_config | 15 from master import master_config |
| 16 from master import master_utils | 16 from master import master_utils |
| 17 from master import slaves_list | 17 from master import slaves_list |
| 18 from master.factory import chromium_factory | 18 from master.factory import chromium_factory |
| 19 | 19 |
| 20 import config | 20 import config |
| 21 import master_site_config |
| 21 | 22 |
| 22 ActiveMaster = config.Master.ChromiumFlaky | 23 ActiveMaster = master_site_config.ChromiumFlaky |
| 23 | 24 |
| 24 # This is the dictionary that the buildmaster pays attention to. We also use | 25 # This is the dictionary that the buildmaster pays attention to. We also use |
| 25 # a shorter alias to save typing. | 26 # a shorter alias to save typing. |
| 26 c = BuildmasterConfig = {} | 27 c = BuildmasterConfig = {} |
| 27 | 28 |
| 28 # 'slavePortnum' defines the TCP port to listen on. This must match the value | 29 # 'slavePortnum' defines the TCP port to listen on. This must match the value |
| 29 # configured into the buildslaves (with their --master option) | 30 # configured into the buildslaves (with their --master option) |
| 30 c['slavePortnum'] = ActiveMaster.slave_port | 31 c['slavePortnum'] = ActiveMaster.slave_port |
| 31 | 32 |
| 32 config.DatabaseSetup(c, require_dbconfig=ActiveMaster.is_production_host) | 33 config.DatabaseSetup(c, require_dbconfig=ActiveMaster.is_production_host) |
| (...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 243 master_utils.AutoSetupMaster(c, ActiveMaster, | 244 master_utils.AutoSetupMaster(c, ActiveMaster, |
| 244 public_html="../master.chromium.git/public_html", | 245 public_html="../master.chromium.git/public_html", |
| 245 templates=['../master.chromium/templates'], | 246 templates=['../master.chromium/templates'], |
| 246 enable_http_status_push=ActiveMaster.is_production_host) | 247 enable_http_status_push=ActiveMaster.is_production_host) |
| 247 | 248 |
| 248 ####### PROJECT IDENTITY | 249 ####### PROJECT IDENTITY |
| 249 | 250 |
| 250 c['projectName'] = ActiveMaster.project_name | 251 c['projectName'] = ActiveMaster.project_name |
| 251 c['projectURL'] = config.Master.project_url | 252 c['projectURL'] = config.Master.project_url |
| 252 c['buildbotURL'] = 'http://build.chromium.org/p/chromium.flaky/' | 253 c['buildbotURL'] = 'http://build.chromium.org/p/chromium.flaky/' |
| OLD | NEW |