| 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 |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 c = BuildmasterConfig = {} | 25 c = BuildmasterConfig = {} |
| 26 c['slavePortnum'] = ActiveMaster.slave_port | 26 c['slavePortnum'] = ActiveMaster.slave_port |
| 27 c['schedulers'] = [] | 27 c['schedulers'] = [] |
| 28 c['builders'] = [] | 28 c['builders'] = [] |
| 29 c['change_source'] = [] | 29 c['change_source'] = [] |
| 30 c['status'] = [] | 30 c['status'] = [] |
| 31 | 31 |
| 32 f_annotations = annotator_factory.AnnotatorFactory(ActiveMaster) | 32 f_annotations = annotator_factory.AnnotatorFactory(ActiveMaster) |
| 33 | 33 |
| 34 def m_remote_run(recipe, **kwargs): | 34 def m_remote_run(recipe, **kwargs): |
| 35 props = {'path_config': 'kitchen'} |
| 36 props.update(kwargs.pop('properties', {})) |
| 35 return remote_run_factory.RemoteRunFactory( | 37 return remote_run_factory.RemoteRunFactory( |
| 36 active_master=ActiveMaster, | 38 active_master=ActiveMaster, |
| 37 repository='https://chromium.googlesource.com/infra/infra.git', | 39 repository=kwargs.pop( |
| 38 recipe=recipe, | 40 'repository', 'https://chromium.googlesource.com/infra/infra.git'), |
| 39 factory_properties={'path_config': 'kitchen'}, | 41 recipe=recipe, |
| 40 **kwargs) | 42 factory_properties=props, |
| 43 **kwargs) |
| 41 | 44 |
| 42 revision_getter = master_utils.ConditionalProperty( | 45 revision_getter = master_utils.ConditionalProperty( |
| 43 lambda build: build.getProperty('revision'), | 46 lambda build: build.getProperty('revision'), |
| 44 WithProperties('%(revision)s'), | 47 WithProperties('%(revision)s'), |
| 45 'origin/master') | 48 'origin/master') |
| 46 | 49 |
| 47 ####### DATABASE | 50 ####### DATABASE |
| 48 | 51 |
| 49 config.DatabaseSetup(c, require_dbconfig=ActiveMaster.is_production_host) | 52 config.DatabaseSetup(c, require_dbconfig=ActiveMaster.is_production_host) |
| 50 | 53 |
| 51 ####### CHANGE SOURCES | 54 ####### CHANGE SOURCES |
| 52 | 55 |
| 53 INFRA_REPO_URL = 'https://chromium.googlesource.com/infra/infra' | 56 INFRA_REPO_URL = 'https://chromium.googlesource.com/infra/infra' |
| 54 LUCI_GO_REPO_URL = ( | 57 LUCI_GO_REPO_URL = ( |
| 55 'https://chromium.googlesource.com/external/github.com/luci/luci-go') | 58 'https://chromium.googlesource.com/external/github.com/luci/luci-go') |
| 56 LUCI_GAE_REPO_URL = ( | 59 LUCI_GAE_REPO_URL = ( |
| 57 'https://chromium.googlesource.com/external/github.com/luci/gae') | 60 'https://chromium.googlesource.com/external/github.com/luci/gae') |
| 58 RECIPES_PY_REPO_URL = ( | 61 RECIPES_PY_REPO_URL = ( |
| 59 'https://chromium.googlesource.com/external/github.com/luci/recipes-py') | 62 'https://chromium.googlesource.com/external/github.com/luci/recipes-py') |
| 60 DEPOT_TOOLS_URL = 'https://chromium.googlesource.com/chromium/tools/depot_tools' | 63 DEPOT_TOOLS_URL = 'https://chromium.googlesource.com/chromium/tools/depot_tools' |
| 64 TOOLS_BUILD_URL = 'https://chromium.googlesource.com/chromium/tools/build' |
| 61 CHROMIUM_REPO_URL = 'https://chromium.googlesource.com/chromium/src' | 65 CHROMIUM_REPO_URL = 'https://chromium.googlesource.com/chromium/src' |
| 62 | 66 |
| 63 c['change_source'].extend([ | 67 c['change_source'].extend([ |
| 64 gitiles_poller.GitilesPoller(INFRA_REPO_URL), | 68 gitiles_poller.GitilesPoller(INFRA_REPO_URL), |
| 65 gitiles_poller.GitilesPoller(LUCI_GAE_REPO_URL, project='luci-gae'), | 69 gitiles_poller.GitilesPoller(LUCI_GAE_REPO_URL, project='luci-gae'), |
| 66 gitiles_poller.GitilesPoller(LUCI_GO_REPO_URL, branches=['master', 'go1']), | 70 gitiles_poller.GitilesPoller(LUCI_GO_REPO_URL, branches=['master', 'go1']), |
| 67 gitiles_poller.GitilesPoller(RECIPES_PY_REPO_URL), | 71 gitiles_poller.GitilesPoller(RECIPES_PY_REPO_URL), |
| 68 gitiles_poller.GitilesPoller(DEPOT_TOOLS_URL), | 72 gitiles_poller.GitilesPoller(DEPOT_TOOLS_URL), |
| 69 gitiles_poller.GitilesPoller(CHROMIUM_REPO_URL), | 73 gitiles_poller.GitilesPoller(CHROMIUM_REPO_URL), |
| 70 ]) | 74 ]) |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 180 'slavebuilddir': 'conda-cipd-pkg', | 184 'slavebuilddir': 'conda-cipd-pkg', |
| 181 'factory': m_remote_run('build_conda_cipd_pkg'), | 185 'factory': m_remote_run('build_conda_cipd_pkg'), |
| 182 'category': 'zconda', | 186 'category': 'zconda', |
| 183 }, | 187 }, |
| 184 { | 188 { |
| 185 'name': 'recipes-py-continuous', | 189 'name': 'recipes-py-continuous', |
| 186 'factory': m_remote_run('recipes_py_continuous'), | 190 'factory': m_remote_run('recipes_py_continuous'), |
| 187 'category': 'recipes-py', | 191 'category': 'recipes-py', |
| 188 }, | 192 }, |
| 189 { | 193 { |
| 194 'name': 'recipe_engine-recipes-tests', |
| 195 'factory': m_remote_run( |
| 196 'infra/recipe_simulation', repository=TOOLS_BUILD_URL, |
| 197 properties={'repo_under_test': 'recipe_engine'}), |
| 198 'category': 'recipes-continuous', |
| 199 }, |
| 200 { |
| 201 'name': 'build-recipes-tests', |
| 202 'factory': m_remote_run( |
| 203 'infra/recipe_simulation', repository=TOOLS_BUILD_URL, |
| 204 properties={'repo_under_test': 'build'}), |
| 205 'category': 'recipes-continuous', |
| 206 }, |
| 207 { |
| 208 'name': 'depot_tools-recipes-tests', |
| 209 'factory': m_remote_run( |
| 210 'infra/recipe_simulation', repository=TOOLS_BUILD_URL, |
| 211 properties={'repo_under_test': 'depot_tools'}), |
| 212 'category': 'recipes-continuous', |
| 213 }, |
| 214 { |
| 190 'name': 'depot_tools zip uploader', | 215 'name': 'depot_tools zip uploader', |
| 191 'slavebuilddir': 'depot_tools_uploader', | 216 'slavebuilddir': 'depot_tools_uploader', |
| 192 'factory': m_remote_run('depot_tools_builder'), | 217 'factory': m_remote_run('depot_tools_builder'), |
| 193 'category': 'depot_tools', | 218 'category': 'depot_tools', |
| 194 }, | 219 }, |
| 195 | 220 |
| 196 { | 221 { |
| 197 'name': 'codesearch-submodules-chromium', | 222 'name': 'codesearch-submodules-chromium', |
| 198 'factory': f_annotations.BaseFactory( | 223 'factory': f_annotations.BaseFactory( |
| 199 'infra/sync_submodules', | 224 'infra/sync_submodules', |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 247 'luci-go-osx', | 272 'luci-go-osx', |
| 248 'luci-go-win64', | 273 'luci-go-win64', |
| 249 ] | 274 ] |
| 250 ), | 275 ), |
| 251 AnyBranchScheduler( | 276 AnyBranchScheduler( |
| 252 name='recipes-py-scheduler', | 277 name='recipes-py-scheduler', |
| 253 change_filter=ChangeFilter(project=['recipes-py']), | 278 change_filter=ChangeFilter(project=['recipes-py']), |
| 254 treeStableTimer=1, | 279 treeStableTimer=1, |
| 255 builderNames=[ | 280 builderNames=[ |
| 256 'recipes-py-continuous', | 281 'recipes-py-continuous', |
| 282 'recipe_engine-recipes-tests' |
| 257 ] | 283 ] |
| 258 ), | 284 ), |
| 259 AnyBranchScheduler( | 285 AnyBranchScheduler( |
| 286 name='build-scheduler', |
| 287 change_filter=ChangeFilter(project=['build']), |
| 288 treeStableTimer=1, |
| 289 builderNames=[ |
| 290 'build-recipes-tests' |
| 291 ] |
| 292 ), |
| 293 AnyBranchScheduler( |
| 260 name='depot_tools-scheduler', | 294 name='depot_tools-scheduler', |
| 261 change_filter=ChangeFilter(project=['depot_tools']), | 295 change_filter=ChangeFilter(project=['depot_tools']), |
| 262 treeStableTimer=1, | 296 treeStableTimer=1, |
| 263 builderNames=[ | 297 builderNames=[ |
| 264 'depot_tools zip uploader', | 298 'depot_tools zip uploader', |
| 299 'depot_tools-recipes-tests' |
| 265 ] | 300 ] |
| 266 ), | 301 ), |
| 267 AnyBranchScheduler( | 302 AnyBranchScheduler( |
| 268 name='chromium-scheduler', | 303 name='chromium-scheduler', |
| 269 change_filter=ChangeFilter(project=['src']), | 304 change_filter=ChangeFilter(project=['src']), |
| 270 treeStableTimer=1, | 305 treeStableTimer=1, |
| 271 builderNames=[ | 306 builderNames=[ |
| 272 'codesearch-submodules-chromium', | 307 'codesearch-submodules-chromium', |
| 273 ] | 308 ] |
| 274 ), | 309 ), |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 308 relayhost=config.Master.smtp, | 343 relayhost=config.Master.smtp, |
| 309 extraRecipients=['swarming-eng@googlegroups.com'], | 344 extraRecipients=['swarming-eng@googlegroups.com'], |
| 310 ), | 345 ), |
| 311 ]) | 346 ]) |
| 312 | 347 |
| 313 | 348 |
| 314 ####### PROJECT IDENTITY | 349 ####### PROJECT IDENTITY |
| 315 | 350 |
| 316 c['projectName'] = ActiveMaster.project_name | 351 c['projectName'] = ActiveMaster.project_name |
| 317 c['buildbotURL'] = ActiveMaster.buildbot_url | 352 c['buildbotURL'] = ActiveMaster.buildbot_url |
| OLD | NEW |