OLD | NEW |
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 # These modules come from scripts/master, which must be in the PYTHONPATH. | 5 # These modules come from scripts/master, which must be in the PYTHONPATH. |
6 from master import master_utils | 6 from master import master_utils |
7 from master import slaves_list | 7 from master import slaves_list |
8 | 8 |
9 import config | 9 import config |
10 ActiveMaster = config.Master.Libjingle | 10 import master_site_config |
| 11 ActiveMaster = master_site_config.Libjingle |
11 | 12 |
12 c = BuildmasterConfig = {} | 13 c = BuildmasterConfig = {} |
13 c['change_source'] = [] | 14 c['change_source'] = [] |
14 c['schedulers'] = [] | 15 c['schedulers'] = [] |
15 c['builders'] = [] | 16 c['builders'] = [] |
16 c['status'] = [] | 17 c['status'] = [] |
17 | 18 |
18 config.DatabaseSetup(c, require_dbconfig=ActiveMaster.is_production_host) | 19 config.DatabaseSetup(c, require_dbconfig=ActiveMaster.is_production_host) |
19 | 20 |
20 import master_source_cfg | 21 import master_source_cfg |
(...skipping 19 matching lines...) Expand all Loading... |
40 config.Master.GetBotPassword(), | 41 config.Master.GetBotPassword(), |
41 missing_recipients=['buildbot@chromium-build-health.appspotmail.com']) | 42 missing_recipients=['buildbot@chromium-build-health.appspotmail.com']) |
42 master_utils.VerifySetup(c, slaves) | 43 master_utils.VerifySetup(c, slaves) |
43 | 44 |
44 # Adds common status and tools to this master. | 45 # Adds common status and tools to this master. |
45 master_utils.AutoSetupMaster(c, ActiveMaster, mail_notifier=True, | 46 master_utils.AutoSetupMaster(c, ActiveMaster, mail_notifier=True, |
46 public_html='../master.chromium/public_html', | 47 public_html='../master.chromium/public_html', |
47 templates=['../master.client.webrtc/templates', | 48 templates=['../master.client.webrtc/templates', |
48 '../master.chromium/templates'], | 49 '../master.chromium/templates'], |
49 enable_http_status_push=ActiveMaster.is_production_host) | 50 enable_http_status_push=ActiveMaster.is_production_host) |
OLD | NEW |