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 | 19 |
20 | 20 |
21 ActiveMaster = master_site_config.Infra | 21 ActiveMaster = master_site_config.Infra |
22 | 22 |
23 c = BuildmasterConfig = {} | 23 c = BuildmasterConfig = {} |
24 c['slavePortnum'] = ActiveMaster.slave_port | 24 c['slavePortnum'] = ActiveMaster.slave_port |
25 c['schedulers'] = [] | 25 c['schedulers'] = [] |
26 c['builders'] = [] | 26 c['builders'] = [] |
27 c['change_source'] = [] | 27 c['change_source'] = [] |
28 c['status'] = [] | 28 c['status'] = [] |
29 | 29 |
30 f_annotations = annotator_factory.AnnotatorFactory(ActiveMaster) | 30 def m_remote_run(recipe, **kwargs): |
| 31 return remote_run_factory.RemoteRunFactory( |
| 32 active_master=ActiveMaster, |
| 33 repository='https://chromium.googlesource.com/chromium/tools/build.git', |
| 34 recipe=recipe, |
| 35 factory_properties={'path_config': 'kitchen'}, |
| 36 **kwargs) |
31 | 37 |
32 ####### DATABASE | 38 ####### DATABASE |
33 | 39 |
34 config.DatabaseSetup(c, require_dbconfig=ActiveMaster.is_production_host) | 40 config.DatabaseSetup(c, require_dbconfig=ActiveMaster.is_production_host) |
35 | 41 |
36 ####### CHANGE SOURCES | 42 ####### CHANGE SOURCES |
37 | 43 |
38 INFRA_REPO_URL = 'https://chromium.googlesource.com/infra/infra' | 44 INFRA_REPO_URL = 'https://chromium.googlesource.com/infra/infra' |
39 LUCI_GO_REPO_URL = ( | 45 LUCI_GO_REPO_URL = ( |
40 'https://chromium.googlesource.com/external/github.com/luci/luci-go') | 46 'https://chromium.googlesource.com/external/github.com/luci/luci-go') |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
76 pollInterval=10, | 82 pollInterval=10, |
77 revlinktmpl=DEPOT_TOOLS_URL+'/+/%s'), | 83 revlinktmpl=DEPOT_TOOLS_URL+'/+/%s'), |
78 ]) | 84 ]) |
79 | 85 |
80 ####### BUILDERS | 86 ####### BUILDERS |
81 | 87 |
82 c['builders'].extend([ | 88 c['builders'].extend([ |
83 { | 89 { |
84 'name': 'infra-continuous-xenial-64', | 90 'name': 'infra-continuous-xenial-64', |
85 'slavebuilddir': 'infra-continuous', | 91 'slavebuilddir': 'infra-continuous', |
86 'factory': f_annotations.BaseFactory('infra/infra_continuous'), | 92 'factory': m_remote_run('infra/infra_continuous'), |
87 'category': '1continuous', | 93 'category': '1continuous', |
88 }, | 94 }, |
89 { | 95 { |
90 'name': 'infra-continuous-wily-64', | 96 'name': 'infra-continuous-wily-64', |
91 'slavebuilddir': 'infra-continuous', | 97 'slavebuilddir': 'infra-continuous', |
92 'factory': f_annotations.BaseFactory('infra/infra_continuous'), | 98 'factory': m_remote_run('infra/infra_continuous'), |
93 'category': '1continuous', | 99 'category': '1continuous', |
94 }, | 100 }, |
95 { | 101 { |
96 'name': 'infra-continuous-trusty-64', | 102 'name': 'infra-continuous-trusty-64', |
97 'slavebuilddir': 'infra-continuous', | 103 'slavebuilddir': 'infra-continuous', |
98 'factory': f_annotations.BaseFactory('infra/infra_continuous'), | 104 'factory': m_remote_run('infra/infra_continuous'), |
99 'category': '1continuous', | 105 'category': '1continuous', |
100 }, | 106 }, |
101 { | 107 { |
102 'name': 'infra-continuous-trusty-32', | 108 'name': 'infra-continuous-trusty-32', |
103 'slavebuilddir': 'infra-continuous', | 109 'slavebuilddir': 'infra-continuous', |
104 'factory': f_annotations.BaseFactory('infra/infra_continuous'), | 110 'factory': m_remote_run('infra/infra_continuous'), |
105 'category': '1continuous', | 111 'category': '1continuous', |
106 }, | 112 }, |
107 { | 113 { |
108 'name': 'infra-continuous-precise-64', | 114 'name': 'infra-continuous-precise-64', |
109 'slavebuilddir': 'infra-continuous', | 115 'slavebuilddir': 'infra-continuous', |
110 'factory': f_annotations.BaseFactory('infra/infra_continuous'), | 116 'factory': m_remote_run('infra/infra_continuous'), |
111 'category': '1continuous', | 117 'category': '1continuous', |
112 }, | 118 }, |
113 { | 119 { |
114 'name': 'infra-continuous-precise-32', | 120 'name': 'infra-continuous-precise-32', |
115 'slavebuilddir': 'infra-continuous', | 121 'slavebuilddir': 'infra-continuous', |
116 'factory': f_annotations.BaseFactory('infra/infra_continuous'), | 122 'factory': m_remote_run('infra/infra_continuous'), |
117 'category': '1continuous', | 123 'category': '1continuous', |
118 }, | 124 }, |
119 { | 125 { |
120 'name': 'infra-continuous-mac-10.11-64', | 126 'name': 'infra-continuous-mac-10.11-64', |
121 'slavebuilddir': 'infra-continuous', | 127 'slavebuilddir': 'infra-continuous', |
122 'factory': f_annotations.BaseFactory('infra/infra_continuous'), | 128 'factory': m_remote_run('infra/infra_continuous'), |
123 'category': '1continuous', | 129 'category': '1continuous', |
124 }, | 130 }, |
125 { | 131 { |
126 'name': 'infra-continuous-mac-10.10-64', | 132 'name': 'infra-continuous-mac-10.10-64', |
127 'slavebuilddir': 'infra-continuous', | 133 'slavebuilddir': 'infra-continuous', |
128 'factory': f_annotations.BaseFactory('infra/infra_continuous'), | 134 'factory': m_remote_run('infra/infra_continuous'), |
129 'category': '1continuous', | 135 'category': '1continuous', |
130 }, | 136 }, |
131 { | 137 { |
132 'name': 'infra-continuous-mac-10.9-64', | 138 'name': 'infra-continuous-mac-10.9-64', |
133 'slavebuilddir': 'infra-continuous', | 139 'slavebuilddir': 'infra-continuous', |
134 'factory': f_annotations.BaseFactory('infra/infra_continuous'), | 140 'factory': m_remote_run('infra/infra_continuous'), |
135 'category': '1continuous', | 141 'category': '1continuous', |
136 }, | 142 }, |
137 { | 143 { |
138 'name': 'infra-continuous-mac-10.8-64', | 144 'name': 'infra-continuous-mac-10.8-64', |
139 'slavebuilddir': 'infra-continuous', | 145 'slavebuilddir': 'infra-continuous', |
140 'factory': f_annotations.BaseFactory('infra/infra_continuous'), | 146 'factory': m_remote_run('infra/infra_continuous'), |
141 'category': '1continuous', | 147 'category': '1continuous', |
142 }, | 148 }, |
143 { | 149 { |
144 'name': 'infra-continuous-mac-10.7-64', | 150 'name': 'infra-continuous-mac-10.7-64', |
145 'slavebuilddir': 'infra-continuous', | 151 'slavebuilddir': 'infra-continuous', |
146 'factory': f_annotations.BaseFactory('infra/infra_continuous'), | 152 'factory': m_remote_run('infra/infra_continuous'), |
147 'category': '1continuous', | 153 'category': '1continuous', |
148 }, | 154 }, |
149 { | 155 { |
150 'name': 'infra-continuous-mac-10.6-64', | 156 'name': 'infra-continuous-mac-10.6-64', |
151 'slavebuilddir': 'infra-continuous', | 157 'slavebuilddir': 'infra-continuous', |
152 'factory': f_annotations.BaseFactory('infra/infra_continuous'), | 158 'factory': m_remote_run('infra/infra_continuous'), |
153 'category': '1continuous', | 159 'category': '1continuous', |
154 }, | 160 }, |
155 { | 161 { |
156 'name': 'infra-continuous-win-32', | 162 'name': 'infra-continuous-win-32', |
157 'slavebuilddir': 'infra-continuous', | 163 'slavebuilddir': 'infra-continuous', |
158 'factory': f_annotations.BaseFactory('infra/infra_continuous'), | 164 'factory': m_remote_run('infra/infra_continuous'), |
159 'category': '1continuous', | 165 'category': '1continuous', |
160 }, | 166 }, |
161 { | 167 { |
162 'name': 'infra-continuous-win-64', | 168 'name': 'infra-continuous-win-64', |
163 'slavebuilddir': 'infra-continuous', | 169 'slavebuilddir': 'infra-continuous', |
164 'factory': f_annotations.BaseFactory('infra/infra_continuous'), | 170 'factory': m_remote_run('infra/infra_continuous'), |
165 'category': '1continuous', | 171 'category': '1continuous', |
166 }, | 172 }, |
167 { | 173 { |
168 'name': 'luci-gae-trusty64', | 174 'name': 'luci-gae-trusty64', |
169 'factory': f_annotations.BaseFactory('infra/luci_gae'), | 175 'factory': m_remote_run('infra/luci_gae'), |
170 'category': 'luci-gae', | 176 'category': 'luci-gae', |
171 }, | 177 }, |
172 { | 178 { |
173 'name': 'luci-go-trusty64', | 179 'name': 'luci-go-trusty64', |
174 'factory': f_annotations.BaseFactory('infra/luci_go'), | 180 'factory': m_remote_run('infra/luci_go'), |
175 'category': 'luci-go', | 181 'category': 'luci-go', |
176 }, | 182 }, |
177 { | 183 { |
178 'name': 'luci-go-precise32', | 184 'name': 'luci-go-precise32', |
179 'factory': f_annotations.BaseFactory('infra/luci_go'), | 185 'factory': m_remote_run('infra/luci_go'), |
180 'category': 'luci-go', | 186 'category': 'luci-go', |
181 }, | 187 }, |
182 { | 188 { |
183 'name': 'luci-go-osx', | 189 'name': 'luci-go-osx', |
184 'factory': f_annotations.BaseFactory('infra/luci_go'), | 190 'factory': m_remote_run('infra/luci_go'), |
185 'category': 'luci-go', | 191 'category': 'luci-go', |
186 }, | 192 }, |
187 { | 193 { |
188 'name': 'luci-go-win64', | 194 'name': 'luci-go-win64', |
189 'factory': f_annotations.BaseFactory('infra/luci_go'), | 195 'factory': m_remote_run('infra/luci_go'), |
190 'category': 'luci-go', | 196 'category': 'luci-go', |
191 }, | 197 }, |
192 { | 198 { |
193 'name': 'conda-cipd-pkg-trusty-64', | 199 'name': 'conda-cipd-pkg-trusty-64', |
194 'slavebuilddir': 'conda-cipd-pkg', | 200 'slavebuilddir': 'conda-cipd-pkg', |
195 'factory': f_annotations.BaseFactory('infra/build_conda_cipd_pkg'), | 201 'factory': m_remote_run('infra/build_conda_cipd_pkg'), |
196 'category': 'zconda', | 202 'category': 'zconda', |
197 }, | 203 }, |
198 { | 204 { |
199 'name': 'conda-cipd-pkg-mac-10.9-64', | 205 'name': 'conda-cipd-pkg-mac-10.9-64', |
200 'slavebuilddir': 'conda-cipd-pkg', | 206 'slavebuilddir': 'conda-cipd-pkg', |
201 'factory': f_annotations.BaseFactory('infra/build_conda_cipd_pkg'), | 207 'factory': m_remote_run('infra/build_conda_cipd_pkg'), |
202 'category': 'zconda', | 208 'category': 'zconda', |
203 }, | 209 }, |
204 { | 210 { |
205 'name': 'conda-cipd-pkg-win-64', | 211 'name': 'conda-cipd-pkg-win-64', |
206 'slavebuilddir': 'conda-cipd-pkg', | 212 'slavebuilddir': 'conda-cipd-pkg', |
207 'factory': f_annotations.BaseFactory('infra/build_conda_cipd_pkg'), | 213 'factory': m_remote_run('infra/build_conda_cipd_pkg'), |
208 'category': 'zconda', | 214 'category': 'zconda', |
209 }, | 215 }, |
210 { | 216 { |
211 'name': 'recipes-py-continuous', | 217 'name': 'recipes-py-continuous', |
212 'factory': f_annotations.BaseFactory('infra/recipes_py_continuous'), | 218 'factory': m_remote_run('infra/recipes_py_continuous'), |
213 'category': 'recipes-py', | 219 'category': 'recipes-py', |
214 }, | 220 }, |
215 { | 221 { |
216 'name': 'depot_tools zip uploader', | 222 'name': 'depot_tools zip uploader', |
217 'slavebuilddir': 'depot_tools_uploader', | 223 'slavebuilddir': 'depot_tools_uploader', |
218 'factory': f_annotations.BaseFactory('infra/depot_tools_builder'), | 224 'factory': m_remote_run('infra/depot_tools_builder'), |
219 'category': 'depot_tools', | 225 'category': 'depot_tools', |
220 }, | 226 }, |
221 ]) | 227 ]) |
222 | 228 |
223 ####### SCHEDULERS | 229 ####### SCHEDULERS |
224 | 230 |
225 c['schedulers'].extend([ | 231 c['schedulers'].extend([ |
226 AnyBranchScheduler( | 232 AnyBranchScheduler( |
227 name='infra-scheduler', | 233 name='infra-scheduler', |
228 change_filter=ChangeFilter(project=['infra']), | 234 change_filter=ChangeFilter(project=['infra']), |
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
315 relayhost=config.Master.smtp, | 321 relayhost=config.Master.smtp, |
316 extraRecipients=['swarming-eng@googlegroups.com'], | 322 extraRecipients=['swarming-eng@googlegroups.com'], |
317 ), | 323 ), |
318 ]) | 324 ]) |
319 | 325 |
320 | 326 |
321 ####### PROJECT IDENTITY | 327 ####### PROJECT IDENTITY |
322 | 328 |
323 c['projectName'] = ActiveMaster.project_name | 329 c['projectName'] = ActiveMaster.project_name |
324 c['buildbotURL'] = ActiveMaster.buildbot_url | 330 c['buildbotURL'] = ActiveMaster.buildbot_url |
OLD | NEW |