OLD | NEW |
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 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 # This module comes from $(TOPLEVEL_DIR)/third_party/buildbot_<VERSION> , | 5 # This module comes from $(TOPLEVEL_DIR)/third_party/buildbot_<VERSION> , |
6 # which must be in the PYTHONPATH. | 6 # which must be in the PYTHONPATH. |
7 from buildbot.status import mail | 7 from buildbot.status import mail |
8 | 8 |
9 # These modules come from $(TOPLEVEL_DIR)/scripts , | 9 # These modules come from $(TOPLEVEL_DIR)/scripts , |
10 # which must be in the PYTHONPATH. | 10 # which must be in the PYTHONPATH. |
11 from master import master_utils | 11 from master import master_utils |
12 from master import slaves_list | 12 from master import slaves_list |
13 | 13 |
14 # This module comes from $(TOPLEVEL_DIR)/site_config , | 14 # This module comes from $(TOPLEVEL_DIR)/site_config , |
15 # which must be in the PYTHONPATH. | 15 # which must be in the PYTHONPATH. |
16 import config | 16 import config |
| 17 import master_site_config |
17 | 18 |
18 # These modules come from the local directory. | 19 # These modules come from the local directory. |
19 import master_builders_cfg | 20 import master_builders_cfg |
20 import master_source_cfg | 21 import master_source_cfg |
21 | 22 |
22 ActiveMaster = config.Master.Skia | 23 ActiveMaster = master_site_config.Skia |
23 | 24 |
24 c = BuildmasterConfig = {} | 25 c = BuildmasterConfig = {} |
25 c['change_source'] = [] | 26 c['change_source'] = [] |
26 c['schedulers'] = [] | 27 c['schedulers'] = [] |
27 c['builders'] = [] | 28 c['builders'] = [] |
28 c['status'] = [] | 29 c['status'] = [] |
29 | 30 |
30 master_source_cfg.Update(config, ActiveMaster, c) | 31 master_source_cfg.Update(config, ActiveMaster, c) |
31 master_builders_cfg.Update(config, ActiveMaster, c) | 32 master_builders_cfg.Update(config, ActiveMaster, c) |
32 | 33 |
(...skipping 22 matching lines...) Expand all Loading... |
55 if ActiveMaster.is_production_host: | 56 if ActiveMaster.is_production_host: |
56 mail_notifier = mail.MailNotifier( | 57 mail_notifier = mail.MailNotifier( |
57 fromaddr=ActiveMaster.from_address, | 58 fromaddr=ActiveMaster.from_address, |
58 sendToInterestedUsers=True, | 59 sendToInterestedUsers=True, |
59 extraRecipients=['skia-commit@googlegroups.com'], | 60 extraRecipients=['skia-commit@googlegroups.com'], |
60 mode='change', | 61 mode='change', |
61 relayhost=config.Master.smtp, | 62 relayhost=config.Master.smtp, |
62 lookup=master_utils.FilterDomain( | 63 lookup=master_utils.FilterDomain( |
63 permitted_domains=config.Master.permitted_domains)) | 64 permitted_domains=config.Master.permitted_domains)) |
64 c['status'].append(mail_notifier) | 65 c['status'].append(mail_notifier) |
OLD | NEW |