| 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 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 155 { | 155 { |
| 156 'name': 'luci-go-osx', | 156 'name': 'luci-go-osx', |
| 157 'factory': f_annotations.BaseFactory('infra/luci_go'), | 157 'factory': f_annotations.BaseFactory('infra/luci_go'), |
| 158 'category': 'luci-go', | 158 'category': 'luci-go', |
| 159 }, | 159 }, |
| 160 { | 160 { |
| 161 'name': 'luci-go-win64', | 161 'name': 'luci-go-win64', |
| 162 'factory': f_annotations.BaseFactory('infra/luci_go'), | 162 'factory': f_annotations.BaseFactory('infra/luci_go'), |
| 163 'category': 'luci-go', | 163 'category': 'luci-go', |
| 164 }, | 164 }, |
| 165 { |
| 166 'name': 'conda-cipd-pkg-trusty-64', |
| 167 'slavebuilddir': 'conda-cipd-pkg', |
| 168 'factory': f_annotations.BaseFactory('infra/build_conda_cipd_pkg'), |
| 169 'category': 'zconda', |
| 170 }, |
| 171 { |
| 172 'name': 'conda-cipd-pkg-mac-10.9-64', |
| 173 'slavebuilddir': 'conda-cipd-pkg', |
| 174 'factory': f_annotations.BaseFactory('infra/build_conda_cipd_pkg'), |
| 175 'category': 'zconda', |
| 176 }, |
| 177 { |
| 178 'name': 'conda-cipd-pkg-win-64', |
| 179 'slavebuilddir': 'conda-cipd-pkg', |
| 180 'factory': f_annotations.BaseFactory('infra/build_conda_cipd_pkg'), |
| 181 'category': 'zconda', |
| 182 }, |
| 165 ]) | 183 ]) |
| 166 | 184 |
| 167 ####### SCHEDULERS | 185 ####### SCHEDULERS |
| 168 | 186 |
| 169 c['schedulers'].extend([ | 187 c['schedulers'].extend([ |
| 170 AnyBranchScheduler( | 188 AnyBranchScheduler( |
| 171 name='infra-scheduler', | 189 name='infra-scheduler', |
| 172 change_filter=ChangeFilter(project=['infra']), | 190 change_filter=ChangeFilter(project=['infra']), |
| 173 treeStableTimer=30, | 191 treeStableTimer=30, |
| 174 builderNames=[ | 192 builderNames=[ |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 241 relayhost=config.Master.smtp, | 259 relayhost=config.Master.smtp, |
| 242 extraRecipients=['swarming-eng@googlegroups.com'], | 260 extraRecipients=['swarming-eng@googlegroups.com'], |
| 243 ), | 261 ), |
| 244 ]) | 262 ]) |
| 245 | 263 |
| 246 | 264 |
| 247 ####### PROJECT IDENTITY | 265 ####### PROJECT IDENTITY |
| 248 | 266 |
| 249 c['projectName'] = ActiveMaster.project_name | 267 c['projectName'] = ActiveMaster.project_name |
| 250 c['buildbotURL'] = ActiveMaster.buildbot_url | 268 c['buildbotURL'] = ActiveMaster.buildbot_url |
| OLD | NEW |