OLD | NEW |
1 # -*- python -*- | 1 # -*- python -*- |
2 # ex: set syntax=python: | 2 # ex: set syntax=python: |
3 | 3 |
4 # Copyright 2015 The Chromium Authors. All rights reserved. | 4 # Copyright 2015 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 config | 8 import config |
9 import master_site_config | 9 import master_site_config |
10 | 10 |
11 from buildbot.changes.filter import ChangeFilter | 11 from buildbot.changes.filter import ChangeFilter |
12 from buildbot.schedulers.basic import AnyBranchScheduler | 12 from buildbot.schedulers.basic import AnyBranchScheduler |
13 from buildbot.status import mail | 13 from buildbot.status import mail |
14 | 14 |
15 from master import gitiles_poller | 15 from master import gitiles_poller |
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 annotator_factory |
18 from master.factory import remote_run_factory | 19 from master.factory import remote_run_factory |
19 | 20 |
20 | 21 |
21 ActiveMaster = master_site_config.Infra | 22 ActiveMaster = master_site_config.Infra |
22 | 23 |
23 c = BuildmasterConfig = {} | 24 c = BuildmasterConfig = {} |
24 c['slavePortnum'] = ActiveMaster.slave_port | 25 c['slavePortnum'] = ActiveMaster.slave_port |
25 c['schedulers'] = [] | 26 c['schedulers'] = [] |
26 c['builders'] = [] | 27 c['builders'] = [] |
27 c['change_source'] = [] | 28 c['change_source'] = [] |
28 c['status'] = [] | 29 c['status'] = [] |
29 | 30 |
| 31 f_annotations = annotator_factory.AnnotatorFactory(ActiveMaster) |
| 32 |
30 def m_remote_run(recipe, **kwargs): | 33 def m_remote_run(recipe, **kwargs): |
31 return remote_run_factory.RemoteRunFactory( | 34 return remote_run_factory.RemoteRunFactory( |
32 active_master=ActiveMaster, | 35 active_master=ActiveMaster, |
33 repository='https://chromium.googlesource.com/chromium/tools/build.git', | 36 repository='https://chromium.googlesource.com/chromium/tools/build.git', |
34 recipe=recipe, | 37 recipe=recipe, |
35 factory_properties={'path_config': 'kitchen'}, | 38 factory_properties={'path_config': 'kitchen'}, |
36 **kwargs) | 39 **kwargs) |
37 | 40 |
38 ####### DATABASE | 41 ####### DATABASE |
39 | 42 |
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
160 }, | 163 }, |
161 { | 164 { |
162 'name': 'infra-continuous-win-32', | 165 'name': 'infra-continuous-win-32', |
163 'slavebuilddir': 'infra-continuous', | 166 'slavebuilddir': 'infra-continuous', |
164 'factory': m_remote_run('infra/infra_continuous'), | 167 'factory': m_remote_run('infra/infra_continuous'), |
165 'category': '1continuous', | 168 'category': '1continuous', |
166 }, | 169 }, |
167 { | 170 { |
168 'name': 'infra-continuous-win-64', | 171 'name': 'infra-continuous-win-64', |
169 'slavebuilddir': 'infra-continuous', | 172 'slavebuilddir': 'infra-continuous', |
170 'factory': m_remote_run('infra/infra_continuous'), | 173 # TODO(phajdan.jr): Convert to remote_run (http://crbug.com/617565). |
| 174 'factory': f_annotations.BaseFactory('infra/infra_continuous'), |
171 'category': '1continuous', | 175 'category': '1continuous', |
172 }, | 176 }, |
173 { | 177 { |
174 'name': 'luci-gae-trusty64', | 178 'name': 'luci-gae-trusty64', |
175 'factory': m_remote_run('infra/luci_gae'), | 179 'factory': m_remote_run('infra/luci_gae'), |
176 'category': 'luci-gae', | 180 'category': 'luci-gae', |
177 }, | 181 }, |
178 { | 182 { |
179 'name': 'luci-go-trusty64', | 183 'name': 'luci-go-trusty64', |
180 'factory': m_remote_run('infra/luci_go'), | 184 'factory': m_remote_run('infra/luci_go'), |
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
321 relayhost=config.Master.smtp, | 325 relayhost=config.Master.smtp, |
322 extraRecipients=['swarming-eng@googlegroups.com'], | 326 extraRecipients=['swarming-eng@googlegroups.com'], |
323 ), | 327 ), |
324 ]) | 328 ]) |
325 | 329 |
326 | 330 |
327 ####### PROJECT IDENTITY | 331 ####### PROJECT IDENTITY |
328 | 332 |
329 c['projectName'] = ActiveMaster.project_name | 333 c['projectName'] = ActiveMaster.project_name |
330 c['buildbotURL'] = ActiveMaster.buildbot_url | 334 c['buildbotURL'] = ActiveMaster.buildbot_url |
OLD | NEW |