| 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 from master import master_utils | 5 from master import master_utils |
| 6 from master import slaves_list | 6 from master import slaves_list |
| 7 from master.factory import nacl_addin_factory | 7 from master.factory import nacl_addin_factory |
| 8 from buildbot.changes import svnpoller | 8 from buildbot.changes import svnpoller |
| 9 from buildbot.scheduler import Scheduler, Periodic | 9 from buildbot.scheduler import Scheduler, Periodic |
| 10 from buildbot.status.mail import MailNotifier | 10 from buildbot.status.mail import MailNotifier |
| 11 | 11 |
| 12 import config | 12 import config |
| 13 import master_site_config |
| 13 | 14 |
| 14 ActiveMaster = config.Master.NativeClientSDKAddIn | 15 ActiveMaster = master_site_config.NativeClientSDKAddIn |
| 15 | 16 |
| 16 c = BuildmasterConfig = {} | 17 c = BuildmasterConfig = {} |
| 17 c['change_source'] = [] | 18 c['change_source'] = [] |
| 18 c['schedulers'] = [] | 19 c['schedulers'] = [] |
| 19 c['builders'] = [] | 20 c['builders'] = [] |
| 20 c['status'] = [] | 21 c['status'] = [] |
| 21 | 22 |
| 22 | 23 |
| 23 c['logCompressionLimit'] = False | 24 c['logCompressionLimit'] = False |
| 24 c['projectName'] = ActiveMaster.project_name | 25 c['projectName'] = ActiveMaster.project_name |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 92 templates=['../master.client.nacl/templates'], | 93 templates=['../master.client.nacl/templates'], |
| 93 order_console_by_time=True, | 94 order_console_by_time=True, |
| 94 enable_http_status_push=ActiveMaster.is_production_host) | 95 enable_http_status_push=ActiveMaster.is_production_host) |
| 95 | 96 |
| 96 # Send mail sbc@ for all build breakages. | 97 # Send mail sbc@ for all build breakages. |
| 97 c['status'].append(MailNotifier(fromaddr=ActiveMaster.from_address, | 98 c['status'].append(MailNotifier(fromaddr=ActiveMaster.from_address, |
| 98 sendToInterestedUsers=False, | 99 sendToInterestedUsers=False, |
| 99 relayhost=config.Master.smtp, | 100 relayhost=config.Master.smtp, |
| 100 mode="problem", | 101 mode="problem", |
| 101 extraRecipients=["sbc@chromium.org"])) | 102 extraRecipients=["sbc@chromium.org"])) |
| OLD | NEW |