| 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 # It has one job: define a dictionary named BuildmasterConfig. This | 8 # It has one job: define a dictionary named BuildmasterConfig. This |
| 9 # dictionary has a variety of keys to control different aspects of the | 9 # dictionary has a variety of keys to control different aspects of the |
| 10 # buildmaster. They are documented in docs/config.xhtml . | 10 # buildmaster. They are documented in docs/config.xhtml . |
| 11 | 11 |
| 12 from buildbot.changes import svnpoller | 12 from buildbot.changes import svnpoller |
| 13 from buildbot.status.mail import MailNotifier | 13 from buildbot.status.mail import MailNotifier |
| 14 from buildbot import scheduler | 14 from buildbot import scheduler |
| 15 | 15 |
| 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 drmemory_factory | 18 from master.factory import drmemory_factory |
| 19 | 19 |
| 20 import config | 20 import config |
| 21 ActiveMaster = config.Master.DynamoRIO | 21 import master_site_config |
| 22 ActiveMaster = master_site_config.DynamoRIO |
| 22 | 23 |
| 23 MASTER_HOST = ActiveMaster.master_host | 24 MASTER_HOST = ActiveMaster.master_host |
| 24 MAIL_NOTIFIER = ActiveMaster.is_production_host | 25 MAIL_NOTIFIER = ActiveMaster.is_production_host |
| 25 MASTER_PORT = ActiveMaster.master_port | 26 MASTER_PORT = ActiveMaster.master_port |
| 26 | 27 |
| 27 # This is the dictionary that the buildmaster pays attention to. We also use | 28 # This is the dictionary that the buildmaster pays attention to. We also use |
| 28 # a shorter alias to save typing. | 29 # a shorter alias to save typing. |
| 29 c = BuildmasterConfig = {} | 30 c = BuildmasterConfig = {} |
| 30 | 31 |
| 31 config.DatabaseSetup(c, require_dbconfig=ActiveMaster.is_production_host) | 32 config.DatabaseSetup(c, require_dbconfig=ActiveMaster.is_production_host) |
| (...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 215 c['projectName'] = ActiveMaster.project_name | 216 c['projectName'] = ActiveMaster.project_name |
| 216 c['projectURL'] = config.Master.project_url | 217 c['projectURL'] = config.Master.project_url |
| 217 | 218 |
| 218 # the 'buildbotURL' string should point to the location where the buildbot's | 219 # the 'buildbotURL' string should point to the location where the buildbot's |
| 219 # internal web server (usually the html.Waterfall page) is visible. This | 220 # internal web server (usually the html.Waterfall page) is visible. This |
| 220 # typically uses the port number set in the Waterfall 'status' entry, but | 221 # typically uses the port number set in the Waterfall 'status' entry, but |
| 221 # with an externally-visible host name which the buildbot cannot figure out | 222 # with an externally-visible host name which the buildbot cannot figure out |
| 222 # without some help. | 223 # without some help. |
| 223 | 224 |
| 224 c['buildbotURL'] = 'http://build.chromium.org/p/client.dynamorio/' | 225 c['buildbotURL'] = 'http://build.chromium.org/p/client.dynamorio/' |
| OLD | NEW |