| 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 25 matching lines...) Expand all Loading... |
| 36 ####### CHANGE SOURCES | 36 ####### CHANGE SOURCES |
| 37 | 37 |
| 38 INFRA_REPO_URL = 'https://chromium.googlesource.com/infra/infra' | 38 INFRA_REPO_URL = 'https://chromium.googlesource.com/infra/infra' |
| 39 LUCI_GO_REPO_URL = ( | 39 LUCI_GO_REPO_URL = ( |
| 40 'https://chromium.googlesource.com/external/github.com/luci/luci-go') | 40 'https://chromium.googlesource.com/external/github.com/luci/luci-go') |
| 41 LUCI_GAE_REPO_URL = ( | 41 LUCI_GAE_REPO_URL = ( |
| 42 'https://chromium.googlesource.com/external/github.com/luci/gae') | 42 'https://chromium.googlesource.com/external/github.com/luci/gae') |
| 43 RECIPES_PY_REPO_URL = ( | 43 RECIPES_PY_REPO_URL = ( |
| 44 'https://chromium.googlesource.com/external/github.com/luci/recipes-py') | 44 'https://chromium.googlesource.com/external/github.com/luci/recipes-py') |
| 45 DEPOT_TOOLS_URL = 'https://chromium.googlesource.com/chromium/tools/depot_tools' | 45 DEPOT_TOOLS_URL = 'https://chromium.googlesource.com/chromium/tools/depot_tools' |
| 46 CHROMIUM_REPO_URL = 'https://chromium.googlesource.com/chromium/src' |
| 46 | 47 |
| 47 c['change_source'].extend([ | 48 c['change_source'].extend([ |
| 48 gitiles_poller.GitilesPoller( | 49 gitiles_poller.GitilesPoller(INFRA_REPO_URL), |
| 49 repo_url=INFRA_REPO_URL, | 50 gitiles_poller.GitilesPoller(LUCI_GAE_REPO_URL, project='luci-gae'), |
| 50 project='infra', | 51 gitiles_poller.GitilesPoller(LUCI_GO_REPO_URL, branches=['master', 'go1']), |
| 51 branches=['master'], | 52 gitiles_poller.GitilesPoller(RECIPES_PY_REPO_URL), |
| 52 pollInterval=10, | 53 gitiles_poller.GitilesPoller(DEPOT_TOOLS_URL), |
| 53 revlinktmpl=INFRA_REPO_URL+'/+/%s'), | 54 gitiles_poller.GitilesPoller(CHROMIUM_REPO_URL), |
| 54 gitiles_poller.GitilesPoller( | |
| 55 repo_url=LUCI_GAE_REPO_URL, | |
| 56 project='luci-gae', | |
| 57 branches=['master'], | |
| 58 pollInterval=10, | |
| 59 revlinktmpl=LUCI_GAE_REPO_URL+'/+/%s'), | |
| 60 gitiles_poller.GitilesPoller( | |
| 61 repo_url=LUCI_GO_REPO_URL, | |
| 62 project='luci-go', | |
| 63 branches=['master', 'go1'], | |
| 64 pollInterval=10, | |
| 65 revlinktmpl=LUCI_GO_REPO_URL+'/+/%s'), | |
| 66 gitiles_poller.GitilesPoller( | |
| 67 repo_url=RECIPES_PY_REPO_URL, | |
| 68 project='recipes-py', | |
| 69 branches=['master'], | |
| 70 pollInterval=10, | |
| 71 revlinktmpl=RECIPES_PY_REPO_URL+'/+/%s'), | |
| 72 gitiles_poller.GitilesPoller( | |
| 73 repo_url=DEPOT_TOOLS_URL, | |
| 74 project='depot_tools', | |
| 75 branches=['master'], | |
| 76 pollInterval=10, | |
| 77 revlinktmpl=DEPOT_TOOLS_URL+'/+/%s'), | |
| 78 ]) | 55 ]) |
| 79 | 56 |
| 80 ####### BUILDERS | 57 ####### BUILDERS |
| 81 | 58 |
| 82 c['builders'].extend([ | 59 c['builders'].extend([ |
| 83 { | 60 { |
| 84 'name': 'infra-continuous-xenial-64', | 61 'name': 'infra-continuous-xenial-64', |
| 85 'slavebuilddir': 'infra-continuous', | 62 'slavebuilddir': 'infra-continuous', |
| 86 'factory': f_annotations.BaseFactory('infra/infra_continuous'), | 63 'factory': f_annotations.BaseFactory('infra/infra_continuous'), |
| 87 'category': '1continuous', | 64 'category': '1continuous', |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 211 'name': 'recipes-py-continuous', | 188 'name': 'recipes-py-continuous', |
| 212 'factory': f_annotations.BaseFactory('infra/recipes_py_continuous'), | 189 'factory': f_annotations.BaseFactory('infra/recipes_py_continuous'), |
| 213 'category': 'recipes-py', | 190 'category': 'recipes-py', |
| 214 }, | 191 }, |
| 215 { | 192 { |
| 216 'name': 'depot_tools zip uploader', | 193 'name': 'depot_tools zip uploader', |
| 217 'slavebuilddir': 'depot_tools_uploader', | 194 'slavebuilddir': 'depot_tools_uploader', |
| 218 'factory': f_annotations.BaseFactory('infra/depot_tools_builder'), | 195 'factory': f_annotations.BaseFactory('infra/depot_tools_builder'), |
| 219 'category': 'depot_tools', | 196 'category': 'depot_tools', |
| 220 }, | 197 }, |
| 198 |
| 199 { |
| 200 'name': 'codesearch-submodules-chromium', |
| 201 'factory': f_annotations.BaseFactory( |
| 202 'infra/sync_submodules', |
| 203 {'source_repo': CHROMIUM_REPO_URL}), |
| 204 }, |
| 205 { |
| 206 'name': 'codesearch-submodules-infra', |
| 207 'factory': f_annotations.BaseFactory( |
| 208 'infra/sync_submodules', |
| 209 {'source_repo': INFRA_REPO_URL}), |
| 210 }, |
| 221 ]) | 211 ]) |
| 222 | 212 |
| 223 ####### SCHEDULERS | 213 ####### SCHEDULERS |
| 224 | 214 |
| 225 c['schedulers'].extend([ | 215 c['schedulers'].extend([ |
| 226 AnyBranchScheduler( | 216 AnyBranchScheduler( |
| 227 name='infra-scheduler', | 217 name='infra-scheduler', |
| 228 change_filter=ChangeFilter(project=['infra']), | 218 change_filter=ChangeFilter(project=['infra']), |
| 229 treeStableTimer=30, | 219 treeStableTimer=30, |
| 230 builderNames=[ | 220 builderNames=[ |
| 221 'codesearch-submodules-infra', |
| 231 'infra-continuous-xenial-64', | 222 'infra-continuous-xenial-64', |
| 232 'infra-continuous-wily-64', | 223 'infra-continuous-wily-64', |
| 233 'infra-continuous-trusty-64', | 224 'infra-continuous-trusty-64', |
| 234 'infra-continuous-trusty-32', | 225 'infra-continuous-trusty-32', |
| 235 'infra-continuous-precise-64', | 226 'infra-continuous-precise-64', |
| 236 'infra-continuous-precise-32', | 227 'infra-continuous-precise-32', |
| 237 'infra-continuous-mac-10.11-64', | 228 'infra-continuous-mac-10.11-64', |
| 238 'infra-continuous-mac-10.10-64', | 229 'infra-continuous-mac-10.10-64', |
| 239 'infra-continuous-mac-10.9-64', | 230 'infra-continuous-mac-10.9-64', |
| 240 'infra-continuous-mac-10.8-64', | 231 'infra-continuous-mac-10.8-64', |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 272 ] | 263 ] |
| 273 ), | 264 ), |
| 274 AnyBranchScheduler( | 265 AnyBranchScheduler( |
| 275 name='depot_tools-scheduler', | 266 name='depot_tools-scheduler', |
| 276 change_filter=ChangeFilter(project=['depot_tools']), | 267 change_filter=ChangeFilter(project=['depot_tools']), |
| 277 treeStableTimer=1, | 268 treeStableTimer=1, |
| 278 builderNames=[ | 269 builderNames=[ |
| 279 'depot_tools zip uploader', | 270 'depot_tools zip uploader', |
| 280 ] | 271 ] |
| 281 ), | 272 ), |
| 273 AnyBranchScheduler( |
| 274 name='chromium-scheduler', |
| 275 change_filter=ChangeFilter(project=['src']), |
| 276 treeStableTimer=1, |
| 277 builderNames=[ |
| 278 'codesearch-submodules-chromium', |
| 279 ] |
| 280 ), |
| 282 ]) | 281 ]) |
| 283 | 282 |
| 284 ####### BUILDSLAVES | 283 ####### BUILDSLAVES |
| 285 | 284 |
| 286 # Associate the slaves to the builders. The configuration is in slaves.cfg. | 285 # Associate the slaves to the builders. The configuration is in slaves.cfg. |
| 287 slaves = slaves_list.SlavesList('slaves.cfg', 'Infra') | 286 slaves = slaves_list.SlavesList('slaves.cfg', 'Infra') |
| 288 for builder in c['builders']: | 287 for builder in c['builders']: |
| 289 builder['slavenames'] = slaves.GetSlavesName(builder=builder['name']) | 288 builder['slavenames'] = slaves.GetSlavesName(builder=builder['name']) |
| 290 | 289 |
| 291 # The 'slaves' list defines the set of allowable buildslaves. List all the | 290 # The 'slaves' list defines the set of allowable buildslaves. List all the |
| (...skipping 23 matching lines...) Expand all Loading... |
| 315 relayhost=config.Master.smtp, | 314 relayhost=config.Master.smtp, |
| 316 extraRecipients=['swarming-eng@googlegroups.com'], | 315 extraRecipients=['swarming-eng@googlegroups.com'], |
| 317 ), | 316 ), |
| 318 ]) | 317 ]) |
| 319 | 318 |
| 320 | 319 |
| 321 ####### PROJECT IDENTITY | 320 ####### PROJECT IDENTITY |
| 322 | 321 |
| 323 c['projectName'] = ActiveMaster.project_name | 322 c['projectName'] = ActiveMaster.project_name |
| 324 c['buildbotURL'] = ActiveMaster.buildbot_url | 323 c['buildbotURL'] = ActiveMaster.buildbot_url |
| OLD | NEW |