| OLD | NEW |
| 1 # -*- python -*- | 1 # -*- python -*- |
| 2 # ex: set syntax=python: | 2 # ex: set syntax=python: |
| 3 | 3 |
| 4 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 4 # Copyright (c) 2012 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 # This is the buildmaster config file for the 'chromium' bot. It must | 8 # This is the buildmaster config file for the 'chromium' bot. It must |
| 9 # be installed as 'master.cfg' in your buildmaster's base directory | 9 # be installed as 'master.cfg' in your buildmaster's base directory |
| 10 # (although the filename can be changed with the --basedir option to | 10 # (although the filename can be changed with the --basedir option to |
| (...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 169 factory_properties={ | 169 factory_properties={ |
| 170 'show_perf_results': True, | 170 'show_perf_results': True, |
| 171 'expectations': True, | 171 'expectations': True, |
| 172 'halt_on_missing_build': True, | 172 'halt_on_missing_build': True, |
| 173 'perf_id': 'linux-release', | 173 'perf_id': 'linux-release', |
| 174 'pyauto_env': { | 174 'pyauto_env': { |
| 175 'DO_NOT_RESTART_PYTHON_FOR_PYAUTO': '1' | 175 'DO_NOT_RESTART_PYTHON_FOR_PYAUTO': '1' |
| 176 }, | 176 }, |
| 177 }) | 177 }) |
| 178 | 178 |
| 179 f_win7_rel = F_WIN(slave_type='BuilderTester', | |
| 180 project='all.sln;chromium_builder_perf_av', | |
| 181 target='Release', | |
| 182 tests=perf_av_tests, | |
| 183 factory_properties={ | |
| 184 'gclient_env': {'GYP_DEFINES': FFMPEG_GYP_DEFINES_WIN}, | |
| 185 'show_perf_results': True, | |
| 186 'expectations': True, | |
| 187 'perf_id': 'win-release'}) | |
| 188 | |
| 189 # ---------------------------------------------------------------------------- | 179 # ---------------------------------------------------------------------------- |
| 190 # BUILDER DEFINITIONS | 180 # BUILDER DEFINITIONS |
| 191 | 181 |
| 192 # The 'builders' list defines the Builders. Each one is configured with a | 182 # The 'builders' list defines the Builders. Each one is configured with a |
| 193 # dictionary, using the following keys: | 183 # dictionary, using the following keys: |
| 194 # name (required): the name used to describe this bilder | 184 # name (required): the name used to describe this bilder |
| 195 # builddir (required): which subdirectory to run the builder in | 185 # builddir (required): which subdirectory to run the builder in |
| 196 # factory (required): a BuildFactory to define how the build is run | 186 # factory (required): a BuildFactory to define how the build is run |
| 197 # periodicBuildTime (optional): if set, force a build every N seconds | 187 # periodicBuildTime (optional): if set, force a build every N seconds |
| 198 # category (optional): it is not used in the normal 'buildbot' meaning. It is | 188 # category (optional): it is not used in the normal 'buildbot' meaning. It is |
| 199 # used by gatekeeper to determine which steps it should | 189 # used by gatekeeper to determine which steps it should |
| 200 # look for to close the tree. | 190 # look for to close the tree. |
| 201 # | 191 # |
| 202 | 192 |
| 203 b_chromium_rel_linux_builder = {'name': 'AV Linux Builder', | 193 b_chromium_rel_linux_builder = {'name': 'AV Linux Builder', |
| 204 'builddir': 'chromium-rel-linux-builder', | 194 'builddir': 'chromium-rel-linux-builder', |
| 205 'factory': f_cr_rel_linux_builder, | 195 'factory': f_cr_rel_linux_builder, |
| 206 'category': '1linux|builders_compile|builder_testers', | 196 'category': '1linux|builders_compile|builder_testers', |
| 207 'auto_reboot': False, | 197 'auto_reboot': False, |
| 208 } | 198 } |
| 209 | 199 |
| 210 b_chromium_rel_linux = {'name': 'AV Linux', | 200 b_chromium_rel_linux = {'name': 'AV Linux', |
| 211 'builddir': 'chromium-rel-linux', | 201 'builddir': 'chromium-rel-linux', |
| 212 'factory': f_cr_rel_linux, | 202 'factory': f_cr_rel_linux, |
| 213 'category': '1linux|builders_compile|builder_testers', | 203 'category': '1linux|builders_compile|builder_testers', |
| 214 } | 204 } |
| 215 | 205 |
| 216 b_chromium_rel_win = {'name': 'AV Win7', | |
| 217 'factory': f_win7_rel, | |
| 218 'category': 'windows', | |
| 219 } | |
| 220 | |
| 221 c['builders'] = [ | 206 c['builders'] = [ |
| 222 b_chromium_rel_linux_builder, | 207 b_chromium_rel_linux_builder, |
| 223 b_chromium_rel_linux, | 208 b_chromium_rel_linux, |
| 224 b_chromium_rel_win, | |
| 225 ] | 209 ] |
| 226 | 210 |
| 227 | 211 |
| 228 ####### BUILDSLAVES | 212 ####### BUILDSLAVES |
| 229 | 213 |
| 230 # Associate the slaves to the manual builders. The configuration is in | 214 # Associate the slaves to the manual builders. The configuration is in |
| 231 # slaves.cfg. | 215 # slaves.cfg. |
| 232 for builder in c['builders']: | 216 for builder in c['builders']: |
| 233 builder['slavenames'] = slaves.GetSlavesName(builder=builder['name']) | 217 builder['slavenames'] = slaves.GetSlavesName(builder=builder['name']) |
| 234 | 218 |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 280 | 264 |
| 281 ####### PROJECT IDENTITY | 265 ####### PROJECT IDENTITY |
| 282 | 266 |
| 283 # the 'projectName' string will be used to describe the project that this | 267 # the 'projectName' string will be used to describe the project that this |
| 284 # buildbot is working on. For example, it is used as the title of the | 268 # buildbot is working on. For example, it is used as the title of the |
| 285 # waterfall HTML page. The 'projectURL' string will be used to provide a link | 269 # waterfall HTML page. The 'projectURL' string will be used to provide a link |
| 286 # from buildbot HTML pages to your project's home page. | 270 # from buildbot HTML pages to your project's home page. |
| 287 | 271 |
| 288 c['projectName'] = ActiveMaster.project_name | 272 c['projectName'] = ActiveMaster.project_name |
| 289 c['projectURL'] = config.Master.project_url | 273 c['projectURL'] = config.Master.project_url |
| OLD | NEW |