| 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 'v8' bot. It must | 8 # This is the buildmaster config file for the 'v8' 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 10 matching lines...) Expand all Loading... |
| 21 from buildbot.scheduler import AnyBranchScheduler | 21 from buildbot.scheduler import AnyBranchScheduler |
| 22 from buildbot.scheduler import Triggerable | 22 from buildbot.scheduler import Triggerable |
| 23 | 23 |
| 24 #from master import build_utils | 24 #from master import build_utils |
| 25 from master import master_utils | 25 from master import master_utils |
| 26 from master import slaves_list | 26 from master import slaves_list |
| 27 from master.factory import v8_factory | 27 from master.factory import v8_factory |
| 28 from master.factory import chromium_factory | 28 from master.factory import chromium_factory |
| 29 | 29 |
| 30 import config | 30 import config |
| 31 import master_site_config |
| 31 import branches_cfg | 32 import branches_cfg |
| 32 | 33 |
| 33 # Get the branches currently tracked on the waterfall, plus the names for the | 34 # Get the branches currently tracked on the waterfall, plus the names for the |
| 34 # slaves on these branches from the branches_cfg.py file. | 35 # slaves on these branches from the branches_cfg.py file. |
| 35 stable_branch = branches_cfg.stable_branch | 36 stable_branch = branches_cfg.stable_branch |
| 36 beta_branch = branches_cfg.beta_branch | 37 beta_branch = branches_cfg.beta_branch |
| 37 branch_names = branches_cfg.branch_names | 38 branch_names = branches_cfg.branch_names |
| 38 | 39 |
| 39 ActiveMaster = config.Master.V8 | 40 ActiveMaster = master_site_config.V8 |
| 40 | 41 |
| 41 SVN_POLLER = True | 42 SVN_POLLER = True |
| 42 | 43 |
| 43 # This is the dictionary that the buildmaster pays attention to. We also use | 44 # This is the dictionary that the buildmaster pays attention to. We also use |
| 44 # a shorter alias to save typing. | 45 # a shorter alias to save typing. |
| 45 c = BuildmasterConfig = {} | 46 c = BuildmasterConfig = {} |
| 46 | 47 |
| 47 | 48 |
| 48 ####### DATABASE | 49 ####### DATABASE |
| 49 | 50 |
| (...skipping 1645 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1695 extraRecipients=['mstarzinger@chromium.org'], | 1696 extraRecipients=['mstarzinger@chromium.org'], |
| 1696 lookup=master_utils.FilterDomain()) | 1697 lookup=master_utils.FilterDomain()) |
| 1697 c['status'].append(mn) | 1698 c['status'].append(mn) |
| 1698 | 1699 |
| 1699 ####### PROJECT IDENTITY | 1700 ####### PROJECT IDENTITY |
| 1700 | 1701 |
| 1701 # Buildbot master url: | 1702 # Buildbot master url: |
| 1702 c['buildbotURL'] = 'http://build.chromium.org/p/client.v8/' | 1703 c['buildbotURL'] = 'http://build.chromium.org/p/client.v8/' |
| 1703 c['projectName'] = ActiveMaster.project_name | 1704 c['projectName'] = ActiveMaster.project_name |
| 1704 c['projectURL'] = config.Master.project_url | 1705 c['projectURL'] = config.Master.project_url |
| OLD | NEW |