| 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 15 matching lines...) Expand all Loading... |
| 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 return remote_run_factory.RemoteRunFactory( | 34 return remote_run_factory.RemoteRunFactory( |
| 35 active_master=ActiveMaster, | 35 active_master=ActiveMaster, |
| 36 repository='https://chromium.googlesource.com/chromium/tools/build.git', | 36 repository='https://chromium.googlesource.com/infra/infra.git', |
| 37 recipe=recipe, | 37 recipe=recipe, |
| 38 factory_properties={'path_config': 'kitchen'}, | 38 factory_properties={'path_config': 'kitchen'}, |
| 39 **kwargs) | 39 **kwargs) |
| 40 | 40 |
| 41 ####### DATABASE | 41 ####### DATABASE |
| 42 | 42 |
| 43 config.DatabaseSetup(c, require_dbconfig=ActiveMaster.is_production_host) | 43 config.DatabaseSetup(c, require_dbconfig=ActiveMaster.is_production_host) |
| 44 | 44 |
| 45 ####### CHANGE SOURCES | 45 ####### CHANGE SOURCES |
| 46 | 46 |
| (...skipping 15 matching lines...) Expand all Loading... |
| 62 gitiles_poller.GitilesPoller(DEPOT_TOOLS_URL), | 62 gitiles_poller.GitilesPoller(DEPOT_TOOLS_URL), |
| 63 gitiles_poller.GitilesPoller(CHROMIUM_REPO_URL), | 63 gitiles_poller.GitilesPoller(CHROMIUM_REPO_URL), |
| 64 ]) | 64 ]) |
| 65 | 65 |
| 66 ####### BUILDERS | 66 ####### BUILDERS |
| 67 | 67 |
| 68 c['builders'].extend([ | 68 c['builders'].extend([ |
| 69 { | 69 { |
| 70 'name': 'infra-continuous-xenial-64', | 70 'name': 'infra-continuous-xenial-64', |
| 71 'slavebuilddir': 'infra-continuous', | 71 'slavebuilddir': 'infra-continuous', |
| 72 'factory': m_remote_run('infra/infra_continuous'), | 72 'factory': m_remote_run('infra_continuous'), |
| 73 'category': '1continuous', | 73 'category': '1continuous', |
| 74 }, | 74 }, |
| 75 { | 75 { |
| 76 'name': 'infra-continuous-wily-64', | 76 'name': 'infra-continuous-wily-64', |
| 77 'slavebuilddir': 'infra-continuous', | 77 'slavebuilddir': 'infra-continuous', |
| 78 'factory': m_remote_run('infra/infra_continuous'), | 78 'factory': m_remote_run('infra_continuous'), |
| 79 'category': '1continuous', | 79 'category': '1continuous', |
| 80 }, | 80 }, |
| 81 { | 81 { |
| 82 'name': 'infra-continuous-trusty-64', | 82 'name': 'infra-continuous-trusty-64', |
| 83 'slavebuilddir': 'infra-continuous', | 83 'slavebuilddir': 'infra-continuous', |
| 84 'factory': m_remote_run('infra/infra_continuous'), | 84 'factory': m_remote_run('infra_continuous'), |
| 85 'category': '1continuous', | 85 'category': '1continuous', |
| 86 }, | 86 }, |
| 87 { | 87 { |
| 88 'name': 'infra-continuous-trusty-32', | 88 'name': 'infra-continuous-trusty-32', |
| 89 'slavebuilddir': 'infra-continuous', | 89 'slavebuilddir': 'infra-continuous', |
| 90 'factory': m_remote_run('infra/infra_continuous'), | 90 'factory': m_remote_run('infra_continuous'), |
| 91 'category': '1continuous', | 91 'category': '1continuous', |
| 92 }, | 92 }, |
| 93 { | 93 { |
| 94 'name': 'infra-continuous-precise-64', | 94 'name': 'infra-continuous-precise-64', |
| 95 'slavebuilddir': 'infra-continuous', | 95 'slavebuilddir': 'infra-continuous', |
| 96 'factory': m_remote_run('infra/infra_continuous'), | 96 'factory': m_remote_run('infra_continuous'), |
| 97 'category': '1continuous', | 97 'category': '1continuous', |
| 98 }, | 98 }, |
| 99 { | 99 { |
| 100 'name': 'infra-continuous-precise-32', | 100 'name': 'infra-continuous-precise-32', |
| 101 'slavebuilddir': 'infra-continuous', | 101 'slavebuilddir': 'infra-continuous', |
| 102 'factory': m_remote_run('infra/infra_continuous'), | 102 'factory': m_remote_run('infra_continuous'), |
| 103 'category': '1continuous', | 103 'category': '1continuous', |
| 104 }, | 104 }, |
| 105 { | 105 { |
| 106 'name': 'infra-continuous-mac-10.11-64', | 106 'name': 'infra-continuous-mac-10.11-64', |
| 107 'slavebuilddir': 'infra-continuous', | 107 'slavebuilddir': 'infra-continuous', |
| 108 'factory': m_remote_run('infra/infra_continuous'), | 108 'factory': m_remote_run('infra_continuous'), |
| 109 'category': '1continuous', | 109 'category': '1continuous', |
| 110 }, | 110 }, |
| 111 { | 111 { |
| 112 'name': 'infra-continuous-mac-10.10-64', | 112 'name': 'infra-continuous-mac-10.10-64', |
| 113 'slavebuilddir': 'infra-continuous', | 113 'slavebuilddir': 'infra-continuous', |
| 114 'factory': m_remote_run('infra/infra_continuous'), | 114 'factory': m_remote_run('infra_continuous'), |
| 115 'category': '1continuous', | 115 'category': '1continuous', |
| 116 }, | 116 }, |
| 117 { | 117 { |
| 118 'name': 'infra-continuous-mac-10.9-64', | 118 'name': 'infra-continuous-mac-10.9-64', |
| 119 'slavebuilddir': 'infra-continuous', | 119 'slavebuilddir': 'infra-continuous', |
| 120 'factory': m_remote_run('infra/infra_continuous'), | 120 'factory': m_remote_run('infra_continuous'), |
| 121 'category': '1continuous', | 121 'category': '1continuous', |
| 122 }, | 122 }, |
| 123 { | 123 { |
| 124 'name': 'infra-continuous-mac-10.8-64', | 124 'name': 'infra-continuous-mac-10.8-64', |
| 125 'slavebuilddir': 'infra-continuous', | 125 'slavebuilddir': 'infra-continuous', |
| 126 'factory': m_remote_run('infra/infra_continuous'), | 126 'factory': m_remote_run('infra_continuous'), |
| 127 'category': '1continuous', | 127 'category': '1continuous', |
| 128 }, | 128 }, |
| 129 { | 129 { |
| 130 'name': 'infra-continuous-mac-10.7-64', | 130 'name': 'infra-continuous-mac-10.7-64', |
| 131 'slavebuilddir': 'infra-continuous', | 131 'slavebuilddir': 'infra-continuous', |
| 132 'factory': m_remote_run('infra/infra_continuous'), | 132 'factory': m_remote_run('infra_continuous'), |
| 133 'category': '1continuous', | 133 'category': '1continuous', |
| 134 }, | 134 }, |
| 135 { | 135 { |
| 136 'name': 'infra-continuous-mac-10.6-64', | 136 'name': 'infra-continuous-mac-10.6-64', |
| 137 'slavebuilddir': 'infra-continuous', | 137 'slavebuilddir': 'infra-continuous', |
| 138 'factory': m_remote_run('infra/infra_continuous'), | 138 'factory': m_remote_run('infra_continuous'), |
| 139 'category': '1continuous', | 139 'category': '1continuous', |
| 140 }, | 140 }, |
| 141 { | 141 { |
| 142 'name': 'infra-continuous-win-32', | 142 'name': 'infra-continuous-win-32', |
| 143 'slavebuilddir': 'infra-continuous', | 143 'slavebuilddir': 'infra-continuous', |
| 144 'factory': m_remote_run('infra/infra_continuous'), | 144 'factory': m_remote_run('infra_continuous'), |
| 145 'category': '1continuous', | 145 'category': '1continuous', |
| 146 }, | 146 }, |
| 147 { | 147 { |
| 148 'name': 'infra-continuous-win-64', | 148 'name': 'infra-continuous-win-64', |
| 149 'slavebuilddir': 'infra-continuous', | 149 'slavebuilddir': 'infra-continuous', |
| 150 # TODO(phajdan.jr): Convert to remote_run (http://crbug.com/617565). | 150 # TODO(phajdan.jr): Convert to remote_run (http://crbug.com/617565). |
| 151 'factory': f_annotations.BaseFactory('infra/infra_continuous'), | 151 'factory': f_annotations.BaseFactory('infra/infra_continuous'), |
| 152 'category': '1continuous', | 152 'category': '1continuous', |
| 153 }, | 153 }, |
| 154 { | 154 { |
| 155 'name': 'luci-gae-trusty64', | 155 'name': 'luci-gae-trusty64', |
| 156 'factory': m_remote_run('infra/luci_gae'), | 156 'factory': m_remote_run('luci_gae'), |
| 157 'category': 'luci-gae', | 157 'category': 'luci-gae', |
| 158 }, | 158 }, |
| 159 { | 159 { |
| 160 'name': 'luci-go-trusty64', | 160 'name': 'luci-go-trusty64', |
| 161 'factory': m_remote_run('infra/luci_go'), | 161 'factory': m_remote_run('luci_go'), |
| 162 'category': 'luci-go', | 162 'category': 'luci-go', |
| 163 }, | 163 }, |
| 164 { | 164 { |
| 165 'name': 'luci-go-precise32', | 165 'name': 'luci-go-precise32', |
| 166 'factory': m_remote_run('infra/luci_go'), | 166 'factory': m_remote_run('luci_go'), |
| 167 'category': 'luci-go', | 167 'category': 'luci-go', |
| 168 }, | 168 }, |
| 169 { | 169 { |
| 170 'name': 'luci-go-osx', | 170 'name': 'luci-go-osx', |
| 171 'factory': m_remote_run('infra/luci_go'), | 171 'factory': m_remote_run('luci_go'), |
| 172 'category': 'luci-go', | 172 'category': 'luci-go', |
| 173 }, | 173 }, |
| 174 { | 174 { |
| 175 'name': 'luci-go-win64', | 175 'name': 'luci-go-win64', |
| 176 'factory': m_remote_run('infra/luci_go'), | 176 'factory': m_remote_run('luci_go'), |
| 177 'category': 'luci-go', | 177 'category': 'luci-go', |
| 178 }, | 178 }, |
| 179 { | 179 { |
| 180 'name': 'conda-cipd-pkg-trusty-64', | 180 'name': 'conda-cipd-pkg-trusty-64', |
| 181 'slavebuilddir': 'conda-cipd-pkg', | 181 'slavebuilddir': 'conda-cipd-pkg', |
| 182 'factory': m_remote_run('infra/build_conda_cipd_pkg'), | 182 'factory': m_remote_run('build_conda_cipd_pkg'), |
| 183 'category': 'zconda', | 183 'category': 'zconda', |
| 184 }, | 184 }, |
| 185 { | 185 { |
| 186 'name': 'conda-cipd-pkg-mac-10.9-64', | 186 'name': 'conda-cipd-pkg-mac-10.9-64', |
| 187 'slavebuilddir': 'conda-cipd-pkg', | 187 'slavebuilddir': 'conda-cipd-pkg', |
| 188 'factory': m_remote_run('infra/build_conda_cipd_pkg'), | 188 'factory': m_remote_run('build_conda_cipd_pkg'), |
| 189 'category': 'zconda', | 189 'category': 'zconda', |
| 190 }, | 190 }, |
| 191 { | 191 { |
| 192 'name': 'conda-cipd-pkg-win-64', | 192 'name': 'conda-cipd-pkg-win-64', |
| 193 'slavebuilddir': 'conda-cipd-pkg', | 193 'slavebuilddir': 'conda-cipd-pkg', |
| 194 'factory': m_remote_run('infra/build_conda_cipd_pkg'), | 194 'factory': m_remote_run('build_conda_cipd_pkg'), |
| 195 'category': 'zconda', | 195 'category': 'zconda', |
| 196 }, | 196 }, |
| 197 { | 197 { |
| 198 'name': 'recipes-py-continuous', | 198 'name': 'recipes-py-continuous', |
| 199 'factory': m_remote_run('infra/recipes_py_continuous'), | 199 'factory': m_remote_run('recipes_py_continuous'), |
| 200 'category': 'recipes-py', | 200 'category': 'recipes-py', |
| 201 }, | 201 }, |
| 202 { | 202 { |
| 203 'name': 'depot_tools zip uploader', | 203 'name': 'depot_tools zip uploader', |
| 204 'slavebuilddir': 'depot_tools_uploader', | 204 'slavebuilddir': 'depot_tools_uploader', |
| 205 'factory': m_remote_run('infra/depot_tools_builder'), | 205 'factory': m_remote_run('depot_tools_builder'), |
| 206 'category': 'depot_tools', | 206 'category': 'depot_tools', |
| 207 }, | 207 }, |
| 208 | 208 |
| 209 { | 209 { |
| 210 'name': 'codesearch-submodules-chromium', | 210 'name': 'codesearch-submodules-chromium', |
| 211 'factory': f_annotations.BaseFactory( | 211 'factory': f_annotations.BaseFactory( |
| 212 'infra/sync_submodules', | 212 'infra/sync_submodules', |
| 213 {'source_repo': CHROMIUM_REPO_URL}), | 213 {'source_repo': CHROMIUM_REPO_URL}), |
| 214 }, | 214 }, |
| 215 { | 215 { |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 324 relayhost=config.Master.smtp, | 324 relayhost=config.Master.smtp, |
| 325 extraRecipients=['swarming-eng@googlegroups.com'], | 325 extraRecipients=['swarming-eng@googlegroups.com'], |
| 326 ), | 326 ), |
| 327 ]) | 327 ]) |
| 328 | 328 |
| 329 | 329 |
| 330 ####### PROJECT IDENTITY | 330 ####### PROJECT IDENTITY |
| 331 | 331 |
| 332 c['projectName'] = ActiveMaster.project_name | 332 c['projectName'] = ActiveMaster.project_name |
| 333 c['buildbotURL'] = ActiveMaster.buildbot_url | 333 c['buildbotURL'] = ActiveMaster.buildbot_url |
| OLD | NEW |