| OLD | NEW |
| 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 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 # These modules come from scripts/master, which must be in the PYTHONPATH. | 5 # These modules come from scripts/master, which must be in the PYTHONPATH. |
| 6 from master import master_utils | 6 from master import master_utils |
| 7 from master import slaves_list | 7 from master import slaves_list |
| 8 | 8 |
| 9 import config | 9 import config |
| 10 import master_site_config |
| 10 | 11 |
| 11 ActiveMaster = config.Master.ChromiumGIT | 12 ActiveMaster = master_site_config.ChromiumGIT |
| 12 | 13 |
| 13 c = BuildmasterConfig = {} | 14 c = BuildmasterConfig = {} |
| 14 c['change_source'] = [] | 15 c['change_source'] = [] |
| 15 c['schedulers'] = [] | 16 c['schedulers'] = [] |
| 16 c['builders'] = [] | 17 c['builders'] = [] |
| 17 c['status'] = [] | 18 c['status'] = [] |
| 18 | 19 |
| 19 config.DatabaseSetup(c, require_dbconfig=ActiveMaster.is_production_host) | 20 config.DatabaseSetup(c, require_dbconfig=ActiveMaster.is_production_host) |
| 20 | 21 |
| 21 import master_database_cfg | 22 import master_database_cfg |
| (...skipping 28 matching lines...) Expand all Loading... |
| 50 # Get a tag comparator from the ChromiumGitPoller instantiated in | 51 # Get a tag comparator from the ChromiumGitPoller instantiated in |
| 51 # master_source_cfg. | 52 # master_source_cfg. |
| 52 tagComparator = c['change_source'][-1].comparator | 53 tagComparator = c['change_source'][-1].comparator |
| 53 | 54 |
| 54 # Adds common status and tools to this master. | 55 # Adds common status and tools to this master. |
| 55 master_utils.AutoSetupMaster(c, ActiveMaster, | 56 master_utils.AutoSetupMaster(c, ActiveMaster, |
| 56 public_html='../master.chromium/public_html', | 57 public_html='../master.chromium/public_html', |
| 57 templates=['../master.chromium/templates'], | 58 templates=['../master.chromium/templates'], |
| 58 tagComparator=tagComparator, | 59 tagComparator=tagComparator, |
| 59 enable_http_status_push=ActiveMaster.is_production_host) | 60 enable_http_status_push=ActiveMaster.is_production_host) |
| OLD | NEW |