| 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 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 | 9 |
| 10 ActiveMaster = config.Master.ChromiumWebkit | 10 ActiveMaster = config.Master.ChromiumWebkit |
| 11 | 11 |
| 12 c = BuildmasterConfig = {} | 12 c = BuildmasterConfig = {} |
| 13 c['change_source'] = [] | 13 c['change_source'] = [] |
| 14 c['schedulers'] = [] | 14 c['schedulers'] = [] |
| 15 c['builders'] = [] | 15 c['builders'] = [] |
| 16 c['status'] = [] | 16 c['status'] = [] |
| 17 | 17 |
| 18 | 18 |
| 19 import master_source_cfg | 19 import master_source_cfg |
| 20 import master_linux_webkit_pinned_cfg | 20 import master_linux_webkit_pinned_cfg |
| 21 import master_mac_webkit_pinned_cfg | 21 import master_mac_webkit_pinned_cfg |
| 22 import master_mac_webkit_pinned_cg_cfg | |
| 23 import master_win_webkit_pinned_cfg | 22 import master_win_webkit_pinned_cfg |
| 24 import master_linux_webkit_latest_cfg | 23 import master_linux_webkit_latest_cfg |
| 25 import master_mac_webkit_latest_cfg | 24 import master_mac_webkit_latest_cfg |
| 26 import master_mac_webkit_latest_cg_cfg | |
| 27 import master_win_webkit_latest_cfg | 25 import master_win_webkit_latest_cfg |
| 28 import master_win_latest_cfg | 26 import master_win_latest_cfg |
| 29 import master_mac_latest_cfg | 27 import master_mac_latest_cfg |
| 30 import master_linux_latest_cfg | 28 import master_linux_latest_cfg |
| 31 | 29 |
| 32 master_source_cfg.Update(config, ActiveMaster, c) | 30 master_source_cfg.Update(config, ActiveMaster, c) |
| 33 | 31 |
| 34 master_win_webkit_pinned_cfg.Update(config, ActiveMaster, c) | 32 master_win_webkit_pinned_cfg.Update(config, ActiveMaster, c) |
| 35 master_mac_webkit_pinned_cfg.Update(config, ActiveMaster, c) | 33 master_mac_webkit_pinned_cfg.Update(config, ActiveMaster, c) |
| 36 master_mac_webkit_pinned_cg_cfg.Update(config, ActiveMaster, c) | |
| 37 master_linux_webkit_pinned_cfg.Update(config, ActiveMaster, c) | 34 master_linux_webkit_pinned_cfg.Update(config, ActiveMaster, c) |
| 38 master_win_webkit_latest_cfg.Update(config, ActiveMaster, c) | 35 master_win_webkit_latest_cfg.Update(config, ActiveMaster, c) |
| 39 master_mac_webkit_latest_cfg.Update(config, ActiveMaster, c) | 36 master_mac_webkit_latest_cfg.Update(config, ActiveMaster, c) |
| 40 master_mac_webkit_latest_cg_cfg.Update(config, ActiveMaster, c) | |
| 41 master_linux_webkit_latest_cfg.Update(config, ActiveMaster, c) | 37 master_linux_webkit_latest_cfg.Update(config, ActiveMaster, c) |
| 42 master_win_latest_cfg.Update(config, ActiveMaster, c) | 38 master_win_latest_cfg.Update(config, ActiveMaster, c) |
| 43 master_mac_latest_cfg.Update(config, ActiveMaster, c) | 39 master_mac_latest_cfg.Update(config, ActiveMaster, c) |
| 44 master_linux_latest_cfg.Update(config, ActiveMaster, c) | 40 master_linux_latest_cfg.Update(config, ActiveMaster, c) |
| 45 | 41 |
| 46 c['logCompressionLimit'] = False | 42 c['logCompressionLimit'] = False |
| 47 c['projectName'] = ActiveMaster.project_name | 43 c['projectName'] = ActiveMaster.project_name |
| 48 c['projectURL'] = config.Master.project_url | 44 c['projectURL'] = config.Master.project_url |
| 49 c['buildbotURL'] = 'http://build.chromium.org/p/chromium.webkit' | 45 c['buildbotURL'] = 'http://build.chromium.org/p/chromium.webkit' |
| 50 | 46 |
| (...skipping 10 matching lines...) Expand all Loading... |
| 61 # slaves registered to a builder. Remove dupes. | 57 # slaves registered to a builder. Remove dupes. |
| 62 c['slaves'] = master_utils.AutoSetupSlaves(c['builders'], | 58 c['slaves'] = master_utils.AutoSetupSlaves(c['builders'], |
| 63 config.Master.GetBotPassword()) | 59 config.Master.GetBotPassword()) |
| 64 master_utils.VerifySetup(c, slaves) | 60 master_utils.VerifySetup(c, slaves) |
| 65 | 61 |
| 66 # Adds common status and tools to this master. | 62 # Adds common status and tools to this master. |
| 67 master_utils.AutoSetupMaster(c, ActiveMaster, | 63 master_utils.AutoSetupMaster(c, ActiveMaster, |
| 68 public_html='../master.chromium/public_html', | 64 public_html='../master.chromium/public_html', |
| 69 templates=['../master.chromium/templates'], | 65 templates=['../master.chromium/templates'], |
| 70 enable_http_status_push=ActiveMaster.is_production_host) | 66 enable_http_status_push=ActiveMaster.is_production_host) |
| OLD | NEW |