| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # Copyright 2013 The Chromium Authors. All rights reserved. | 2 # Copyright 2013 The Chromium Authors. All rights reserved. |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 | 5 |
| 6 import os | 6 import os |
| 7 | 7 |
| 8 from common import chromium_utils | 8 from common import chromium_utils |
| 9 | 9 |
| 10 from master import master_utils | 10 from master import master_utils |
| (...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 252 | 252 |
| 253 slaves = slaves_list.SlavesList('slaves.cfg', 'V8TryServer') | 253 slaves = slaves_list.SlavesList('slaves.cfg', 'V8TryServer') |
| 254 for builder in c['builders']: | 254 for builder in c['builders']: |
| 255 # Associate the slaves to the builders. The configuration is in slaves.cfg. | 255 # Associate the slaves to the builders. The configuration is in slaves.cfg. |
| 256 builder['slavenames'] = slaves.GetSlavesName(builder=builder['name']) | 256 builder['slavenames'] = slaves.GetSlavesName(builder=builder['name']) |
| 257 # Sets nextSlave function for slave affinity. | 257 # Sets nextSlave function for slave affinity. |
| 258 builder['nextSlave'] = master_utils.PreferredBuilderNextSlaveFuncNG() | 258 builder['nextSlave'] = master_utils.PreferredBuilderNextSlaveFuncNG() |
| 259 | 259 |
| 260 # The 'slaves' list defines the set of allowable buildslaves. List all the | 260 # The 'slaves' list defines the set of allowable buildslaves. List all the |
| 261 # slaves registered to a builder. Remove dupes. | 261 # slaves registered to a builder. Remove dupes. |
| 262 c['slaves'] = master_utils.AutoSetupSlaves(c['builders'], | 262 c['slaves'] = master_utils.AutoSetupSlaves( |
| 263 config.Master.GetBotPassword()) | 263 c['builders'], |
| 264 config.Master.GetBotPassword(), |
| 265 preferred_builder_dict=slaves.GetPreferredBuildersDict()) |
| 264 | 266 |
| 265 # Make sure everything works together. | 267 # Make sure everything works together. |
| 266 master_utils.VerifySetup(c, slaves) | 268 master_utils.VerifySetup(c, slaves) |
| 267 | 269 |
| 268 ####### STATUS TARGETS | 270 ####### STATUS TARGETS |
| 269 | 271 |
| 270 # Buildbot master url: | 272 # Buildbot master url: |
| 271 # Must come before AutoSetupMaster(). | 273 # Must come before AutoSetupMaster(). |
| 272 c['buildbotURL'] = ActiveMaster.buildbot_url | 274 c['buildbotURL'] = ActiveMaster.buildbot_url |
| 273 | 275 |
| (...skipping 29 matching lines...) Expand all Loading... |
| 303 c['logHorizon'] = 2000 | 305 c['logHorizon'] = 2000 |
| 304 # Must be at least 2x the number of slaves. | 306 # Must be at least 2x the number of slaves. |
| 305 c['eventHorizon'] = 200 | 307 c['eventHorizon'] = 200 |
| 306 # Adjust the buildCaches to be 3x the number of slaves per builder. | 308 # Adjust the buildCaches to be 3x the number of slaves per builder. |
| 307 c['autoBuildCacheRatio'] = 3 | 309 c['autoBuildCacheRatio'] = 3 |
| 308 | 310 |
| 309 ####### PROJECT IDENTITY | 311 ####### PROJECT IDENTITY |
| 310 | 312 |
| 311 c['projectName'] = ActiveMaster.project_name | 313 c['projectName'] = ActiveMaster.project_name |
| 312 c['projectURL'] = config.Master.project_url | 314 c['projectURL'] = config.Master.project_url |
| OLD | NEW |