| 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 13 matching lines...) Expand all Loading... |
| 24 c = BuildmasterConfig = {} | 24 c = BuildmasterConfig = {} |
| 25 c['slavePortnum'] = ActiveMaster.slave_port | 25 c['slavePortnum'] = ActiveMaster.slave_port |
| 26 c['schedulers'] = [] | 26 c['schedulers'] = [] |
| 27 c['builders'] = [] | 27 c['builders'] = [] |
| 28 c['change_source'] = [] | 28 c['change_source'] = [] |
| 29 c['status'] = [] | 29 c['status'] = [] |
| 30 | 30 |
| 31 f_annotations = annotator_factory.AnnotatorFactory(ActiveMaster) | 31 f_annotations = annotator_factory.AnnotatorFactory(ActiveMaster) |
| 32 | 32 |
| 33 def m_remote_run(recipe, **kwargs): | 33 def m_remote_run(recipe, **kwargs): |
| 34 props = {'path_config': 'kitchen'} |
| 35 props.update(kwargs.pop('properties', {}) |
| 34 return remote_run_factory.RemoteRunFactory( | 36 return remote_run_factory.RemoteRunFactory( |
| 35 active_master=ActiveMaster, | 37 active_master=ActiveMaster, |
| 36 repository='https://chromium.googlesource.com/infra/infra.git', | 38 repository=kwargs.pop( |
| 37 recipe=recipe, | 39 'repository', 'https://chromium.googlesource.com/infra/infra.git'), |
| 38 factory_properties={'path_config': 'kitchen'}, | 40 recipe=recipe, |
| 39 **kwargs) | 41 factory_properties=props, |
| 42 **kwargs) |
| 40 | 43 |
| 41 ####### DATABASE | 44 ####### DATABASE |
| 42 | 45 |
| 43 config.DatabaseSetup(c, require_dbconfig=ActiveMaster.is_production_host) | 46 config.DatabaseSetup(c, require_dbconfig=ActiveMaster.is_production_host) |
| 44 | 47 |
| 45 ####### CHANGE SOURCES | 48 ####### CHANGE SOURCES |
| 46 | 49 |
| 47 INFRA_REPO_URL = 'https://chromium.googlesource.com/infra/infra' | 50 INFRA_REPO_URL = 'https://chromium.googlesource.com/infra/infra' |
| 48 LUCI_GO_REPO_URL = ( | 51 LUCI_GO_REPO_URL = ( |
| 49 'https://chromium.googlesource.com/external/github.com/luci/luci-go') | 52 'https://chromium.googlesource.com/external/github.com/luci/luci-go') |
| 50 LUCI_GAE_REPO_URL = ( | 53 LUCI_GAE_REPO_URL = ( |
| 51 'https://chromium.googlesource.com/external/github.com/luci/gae') | 54 'https://chromium.googlesource.com/external/github.com/luci/gae') |
| 52 RECIPES_PY_REPO_URL = ( | 55 RECIPES_PY_REPO_URL = ( |
| 53 'https://chromium.googlesource.com/external/github.com/luci/recipes-py') | 56 'https://chromium.googlesource.com/external/github.com/luci/recipes-py') |
| 54 DEPOT_TOOLS_URL = 'https://chromium.googlesource.com/chromium/tools/depot_tools' | 57 DEPOT_TOOLS_URL = 'https://chromium.googlesource.com/chromium/tools/depot_tools' |
| 58 TOOLS_BUILD_URL = 'https://chromium.googlesource.com/chromium/tools/build' |
| 55 CHROMIUM_REPO_URL = 'https://chromium.googlesource.com/chromium/src' | 59 CHROMIUM_REPO_URL = 'https://chromium.googlesource.com/chromium/src' |
| 56 | 60 |
| 57 c['change_source'].extend([ | 61 c['change_source'].extend([ |
| 58 gitiles_poller.GitilesPoller(INFRA_REPO_URL), | 62 gitiles_poller.GitilesPoller(INFRA_REPO_URL), |
| 59 gitiles_poller.GitilesPoller(LUCI_GAE_REPO_URL, project='luci-gae'), | 63 gitiles_poller.GitilesPoller(LUCI_GAE_REPO_URL, project='luci-gae'), |
| 60 gitiles_poller.GitilesPoller(LUCI_GO_REPO_URL, branches=['master', 'go1']), | 64 gitiles_poller.GitilesPoller(LUCI_GO_REPO_URL, branches=['master', 'go1']), |
| 61 gitiles_poller.GitilesPoller(RECIPES_PY_REPO_URL), | 65 gitiles_poller.GitilesPoller(RECIPES_PY_REPO_URL), |
| 62 gitiles_poller.GitilesPoller(DEPOT_TOOLS_URL), | 66 gitiles_poller.GitilesPoller(DEPOT_TOOLS_URL), |
| 63 gitiles_poller.GitilesPoller(CHROMIUM_REPO_URL), | 67 gitiles_poller.GitilesPoller(CHROMIUM_REPO_URL), |
| 64 ]) | 68 ]) |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 174 'slavebuilddir': 'conda-cipd-pkg', | 178 'slavebuilddir': 'conda-cipd-pkg', |
| 175 'factory': m_remote_run('build_conda_cipd_pkg'), | 179 'factory': m_remote_run('build_conda_cipd_pkg'), |
| 176 'category': 'zconda', | 180 'category': 'zconda', |
| 177 }, | 181 }, |
| 178 { | 182 { |
| 179 'name': 'recipes-py-continuous', | 183 'name': 'recipes-py-continuous', |
| 180 'factory': m_remote_run('recipes_py_continuous'), | 184 'factory': m_remote_run('recipes_py_continuous'), |
| 181 'category': 'recipes-py', | 185 'category': 'recipes-py', |
| 182 }, | 186 }, |
| 183 { | 187 { |
| 188 'name': 'recipe_engine-recipes-tests', |
| 189 'factory': m_remote_run( |
| 190 'infra/recipe_simulation', repository=TOOLS_BUILD_URL, |
| 191 properties={'repo_under_test': 'recipe_engine'}), |
| 192 'category': 'recipes-continuous', |
| 193 }, |
| 194 { |
| 195 'name': 'build-recipes-tests', |
| 196 'factory': m_remote_run( |
| 197 'infra/recipe_simulation', repository=TOOLS_BUILD_URL, |
| 198 properties={'repo_under_test': 'build'}), |
| 199 'category': 'recipes-continuous', |
| 200 }, |
| 201 { |
| 202 'name': 'depot_tools-recipes-tests', |
| 203 'factory': m_remote_run( |
| 204 'infra/recipe_simulation', repository=TOOLS_BUILD_URL, |
| 205 properties={'repo_under_test': 'depot_tools'}), |
| 206 'category': 'recipes-continuous', |
| 207 }, |
| 208 { |
| 184 'name': 'depot_tools zip uploader', | 209 'name': 'depot_tools zip uploader', |
| 185 'slavebuilddir': 'depot_tools_uploader', | 210 'slavebuilddir': 'depot_tools_uploader', |
| 186 'factory': m_remote_run('depot_tools_builder'), | 211 'factory': m_remote_run('depot_tools_builder'), |
| 187 'category': 'depot_tools', | 212 'category': 'depot_tools', |
| 188 }, | 213 }, |
| 189 | 214 |
| 190 { | 215 { |
| 191 'name': 'codesearch-submodules-chromium', | 216 'name': 'codesearch-submodules-chromium', |
| 192 'factory': f_annotations.BaseFactory( | 217 'factory': f_annotations.BaseFactory( |
| 193 'infra/sync_submodules', | 218 'infra/sync_submodules', |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 302 relayhost=config.Master.smtp, | 327 relayhost=config.Master.smtp, |
| 303 extraRecipients=['swarming-eng@googlegroups.com'], | 328 extraRecipients=['swarming-eng@googlegroups.com'], |
| 304 ), | 329 ), |
| 305 ]) | 330 ]) |
| 306 | 331 |
| 307 | 332 |
| 308 ####### PROJECT IDENTITY | 333 ####### PROJECT IDENTITY |
| 309 | 334 |
| 310 c['projectName'] = ActiveMaster.project_name | 335 c['projectName'] = ActiveMaster.project_name |
| 311 c['buildbotURL'] = ActiveMaster.buildbot_url | 336 c['buildbotURL'] = ActiveMaster.buildbot_url |
| OLD | NEW |