| 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 22 matching lines...) Expand all Loading... |
| 33 | 33 |
| 34 config.DatabaseSetup(c, require_dbconfig=ActiveMaster.is_production_host) | 34 config.DatabaseSetup(c, require_dbconfig=ActiveMaster.is_production_host) |
| 35 | 35 |
| 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 DEPOT_TOOLS_URL = 'https://chromium.googlesource.com/chromium/tools/depot_tools' |
| 43 | 44 |
| 44 c['change_source'].extend([ | 45 c['change_source'].extend([ |
| 45 gitiles_poller.GitilesPoller( | 46 gitiles_poller.GitilesPoller( |
| 46 repo_url=INFRA_REPO_URL, | 47 repo_url=INFRA_REPO_URL, |
| 47 project='infra', | 48 project='infra', |
| 48 branches=['master'], | 49 branches=['master'], |
| 49 pollInterval=10, | 50 pollInterval=10, |
| 50 revlinktmpl=INFRA_REPO_URL+'/+/%s'), | 51 revlinktmpl=INFRA_REPO_URL+'/+/%s'), |
| 51 gitiles_poller.GitilesPoller( | 52 gitiles_poller.GitilesPoller( |
| 52 repo_url=LUCI_GAE_REPO_URL, | 53 repo_url=LUCI_GAE_REPO_URL, |
| 53 project='luci-gae', | 54 project='luci-gae', |
| 54 branches=['master'], | 55 branches=['master'], |
| 55 pollInterval=10, | 56 pollInterval=10, |
| 56 revlinktmpl=LUCI_GAE_REPO_URL+'/+/%s'), | 57 revlinktmpl=LUCI_GAE_REPO_URL+'/+/%s'), |
| 57 gitiles_poller.GitilesPoller( | 58 gitiles_poller.GitilesPoller( |
| 58 repo_url=LUCI_GO_REPO_URL, | 59 repo_url=LUCI_GO_REPO_URL, |
| 59 project='luci-go', | 60 project='luci-go', |
| 60 branches=['master', 'go1'], | 61 branches=['master', 'go1'], |
| 61 pollInterval=10, | 62 pollInterval=10, |
| 62 revlinktmpl=LUCI_GO_REPO_URL+'/+/%s'), | 63 revlinktmpl=LUCI_GO_REPO_URL+'/+/%s'), |
| 64 gitiles_poller.GitilesPoller( |
| 65 repo_url=DEPOT_TOOLS_URL, |
| 66 project='depot_tools', |
| 67 branches=['master'], |
| 68 pollInterval=10, |
| 69 revlinktmpl=DEPOT_TOOLS_URL+'/+/%s'), |
| 63 ]) | 70 ]) |
| 64 | 71 |
| 65 ####### BUILDERS | 72 ####### BUILDERS |
| 66 | 73 |
| 67 c['builders'].extend([ | 74 c['builders'].extend([ |
| 68 { | 75 { |
| 69 'name': 'infra-continuous-trusty-64', | 76 'name': 'infra-continuous-trusty-64', |
| 70 'slavebuilddir': 'infra-continuous', | 77 'slavebuilddir': 'infra-continuous', |
| 71 'factory': f_annotations.BaseFactory('infra/infra_continuous'), | 78 'factory': f_annotations.BaseFactory('infra/infra_continuous'), |
| 72 'category': '1continuous', | 79 'category': '1continuous', |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 173 'slavebuilddir': 'conda-cipd-pkg', | 180 'slavebuilddir': 'conda-cipd-pkg', |
| 174 'factory': f_annotations.BaseFactory('infra/build_conda_cipd_pkg'), | 181 'factory': f_annotations.BaseFactory('infra/build_conda_cipd_pkg'), |
| 175 'category': 'zconda', | 182 'category': 'zconda', |
| 176 }, | 183 }, |
| 177 { | 184 { |
| 178 'name': 'conda-cipd-pkg-win-64', | 185 'name': 'conda-cipd-pkg-win-64', |
| 179 'slavebuilddir': 'conda-cipd-pkg', | 186 'slavebuilddir': 'conda-cipd-pkg', |
| 180 'factory': f_annotations.BaseFactory('infra/build_conda_cipd_pkg'), | 187 'factory': f_annotations.BaseFactory('infra/build_conda_cipd_pkg'), |
| 181 'category': 'zconda', | 188 'category': 'zconda', |
| 182 }, | 189 }, |
| 190 { |
| 191 'name': 'depot_tools zip uploader', |
| 192 'slavebuilddir': 'depot_tools_uploader', |
| 193 'factory': f_annotations.BaseFactory('infra/depot_tools_builder'), |
| 194 'category': 'depot_tools', |
| 195 }, |
| 183 ]) | 196 ]) |
| 184 | 197 |
| 185 ####### SCHEDULERS | 198 ####### SCHEDULERS |
| 186 | 199 |
| 187 c['schedulers'].extend([ | 200 c['schedulers'].extend([ |
| 188 AnyBranchScheduler( | 201 AnyBranchScheduler( |
| 189 name='infra-scheduler', | 202 name='infra-scheduler', |
| 190 change_filter=ChangeFilter(project=['infra']), | 203 change_filter=ChangeFilter(project=['infra']), |
| 191 treeStableTimer=30, | 204 treeStableTimer=30, |
| 192 builderNames=[ | 205 builderNames=[ |
| (...skipping 23 matching lines...) Expand all Loading... |
| 216 name='luci-go-scheduler', | 229 name='luci-go-scheduler', |
| 217 change_filter=ChangeFilter(project=['luci-go']), | 230 change_filter=ChangeFilter(project=['luci-go']), |
| 218 treeStableTimer=1, | 231 treeStableTimer=1, |
| 219 builderNames=[ | 232 builderNames=[ |
| 220 'luci-go-trusty64', | 233 'luci-go-trusty64', |
| 221 'luci-go-precise32', | 234 'luci-go-precise32', |
| 222 'luci-go-osx', | 235 'luci-go-osx', |
| 223 'luci-go-win64', | 236 'luci-go-win64', |
| 224 ] | 237 ] |
| 225 ), | 238 ), |
| 239 AnyBranchScheduler( |
| 240 name='depot_tools-scheduler', |
| 241 change_filter=ChangeFilter(project=['depot_tools']), |
| 242 treeStableTimer=1, |
| 243 builderNames=[ |
| 244 'depot_tools zip uploader', |
| 245 ] |
| 246 ), |
| 226 ]) | 247 ]) |
| 227 | 248 |
| 228 ####### BUILDSLAVES | 249 ####### BUILDSLAVES |
| 229 | 250 |
| 230 # Associate the slaves to the builders. The configuration is in slaves.cfg. | 251 # Associate the slaves to the builders. The configuration is in slaves.cfg. |
| 231 slaves = slaves_list.SlavesList('slaves.cfg', 'Infra') | 252 slaves = slaves_list.SlavesList('slaves.cfg', 'Infra') |
| 232 for builder in c['builders']: | 253 for builder in c['builders']: |
| 233 builder['slavenames'] = slaves.GetSlavesName(builder=builder['name']) | 254 builder['slavenames'] = slaves.GetSlavesName(builder=builder['name']) |
| 234 | 255 |
| 235 # The 'slaves' list defines the set of allowable buildslaves. List all the | 256 # The 'slaves' list defines the set of allowable buildslaves. List all the |
| (...skipping 23 matching lines...) Expand all Loading... |
| 259 relayhost=config.Master.smtp, | 280 relayhost=config.Master.smtp, |
| 260 extraRecipients=['swarming-eng@googlegroups.com'], | 281 extraRecipients=['swarming-eng@googlegroups.com'], |
| 261 ), | 282 ), |
| 262 ]) | 283 ]) |
| 263 | 284 |
| 264 | 285 |
| 265 ####### PROJECT IDENTITY | 286 ####### PROJECT IDENTITY |
| 266 | 287 |
| 267 c['projectName'] = ActiveMaster.project_name | 288 c['projectName'] = ActiveMaster.project_name |
| 268 c['buildbotURL'] = ActiveMaster.buildbot_url | 289 c['buildbotURL'] = ActiveMaster.buildbot_url |
| OLD | NEW |