| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 from master import master_utils | 5 from master import master_utils |
| 6 from master import slaves_list | 6 from master import slaves_list |
| 7 | 7 |
| 8 import config | 8 import config |
| 9 import master_site_config | 9 import master_site_config |
| 10 | 10 |
| (...skipping 26 matching lines...) Expand all Loading... |
| 37 | 37 |
| 38 c['projectName'] = ActiveMaster.project_name | 38 c['projectName'] = ActiveMaster.project_name |
| 39 c['projectURL'] = config.Master.project_url | 39 c['projectURL'] = config.Master.project_url |
| 40 # Must come before AutoSetupMaster(). | 40 # Must come before AutoSetupMaster(). |
| 41 c['buildbotURL'] = ActiveMaster.buildbot_url | 41 c['buildbotURL'] = ActiveMaster.buildbot_url |
| 42 | 42 |
| 43 # Associate the slaves to the manual builders. The configuration is in | 43 # Associate the slaves to the manual builders. The configuration is in |
| 44 # slaves.cfg. | 44 # slaves.cfg. |
| 45 slaves = slaves_list.SlavesList('slaves.cfg', 'ChromiumWebkit') | 45 slaves = slaves_list.SlavesList('slaves.cfg', 'ChromiumWebkit') |
| 46 | 46 |
| 47 config.DatabaseSetup(c, require_dbconfig=ActiveMaster.is_production_host) | 47 config.DatabaseSetup(c) |
| 48 | 48 |
| 49 for builder in c['builders']: | 49 for builder in c['builders']: |
| 50 builder['slavenames'] = slaves.GetSlavesName(builder=builder['name']) | 50 builder['slavenames'] = slaves.GetSlavesName(builder=builder['name']) |
| 51 | 51 |
| 52 # The 'slaves' list defines the set of allowable buildslaves. List all the | 52 # The 'slaves' list defines the set of allowable buildslaves. List all the |
| 53 # slaves registered to a builder. Remove dupes. | 53 # slaves registered to a builder. Remove dupes. |
| 54 c['slaves'] = master_utils.AutoSetupSlaves(c['builders'], | 54 c['slaves'] = master_utils.AutoSetupSlaves(c['builders'], |
| 55 config.Master.GetBotPassword()) | 55 config.Master.GetBotPassword()) |
| 56 master_utils.VerifySetup(c, slaves) | 56 master_utils.VerifySetup(c, slaves) |
| 57 | 57 |
| 58 # Adds common status and tools to this master. | 58 # Adds common status and tools to this master. |
| 59 master_utils.AutoSetupMaster(c, ActiveMaster, | 59 master_utils.AutoSetupMaster(c, ActiveMaster, |
| 60 public_html='../master.chromium/public_html', | 60 public_html='../master.chromium/public_html', |
| 61 templates=['../master.chromium/templates'], | 61 templates=['../master.chromium/templates'], |
| 62 order_console_by_time=True, | 62 order_console_by_time=True, |
| 63 enable_http_status_push=ActiveMaster.is_production_host) | 63 enable_http_status_push=ActiveMaster.is_production_host) |
| OLD | NEW |