| OLD | NEW |
| 1 # -*- python -*- | 1 # -*- python -*- |
| 2 # ex: set syntax=python: | 2 # ex: set syntax=python: |
| 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 4 # Use of this source code is governed by a BSD-style license that can be | 4 # Use of this source code is governed by a BSD-style license that can be |
| 5 # found in the LICENSE file. | 5 # found in the LICENSE file. |
| 6 | 6 |
| 7 # See master.experimental/slaves.cfg for documentation. | 7 # See master.experimental/slaves.cfg for documentation. |
| 8 | 8 |
| 9 # down slaves don't cause re-allocation, just removal | 9 # down slaves don't cause re-allocation, just removal |
| 10 down_slaves = [ | 10 down_slaves = [ |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 | 39 |
| 40 def linux(): | 40 def linux(): |
| 41 """Linux VMs can hold a maximum of 4 checkouts per slave.""" | 41 """Linux VMs can hold a maximum of 4 checkouts per slave.""" |
| 42 | 42 |
| 43 normal_slaves = range(384, 430) | 43 normal_slaves = range(384, 430) |
| 44 new_slaves_block = range(2, 100) | 44 new_slaves_block = range(2, 100) |
| 45 all_slaves = (['vm%d-m4' % i for i in normal_slaves] + | 45 all_slaves = (['vm%d-m4' % i for i in normal_slaves] + |
| 46 ['slave%d-c4' % i for i in new_slaves_block]) | 46 ['slave%d-c4' % i for i in new_slaves_block]) |
| 47 gpu_slaves = [3, 7, 8] | 47 gpu_slaves = [3, 7, 8] |
| 48 # "precise" means "Ubuntu 12.04 'precise'". | 48 # "precise" means "Ubuntu 12.04 'precise'". |
| 49 precise_slaves = [468, 469, 497, 502, 503] | 49 precise_slaves = [468, 469, 497, 502, 503] + range(750, 782) |
| 50 precise32_slaves = [211] | 50 precise32_slaves = [211] |
| 51 | 51 |
| 52 # Configurations on every VM. | 52 # Configurations on every VM. |
| 53 base = [ | 53 base = [ |
| 54 # One line per shared directory. In decreasing usage: | 54 # One line per shared directory. In decreasing usage: |
| 55 'linux', 'linux_rel', 'linux_rel_naclmore', | 55 'linux', 'linux_rel', 'linux_rel_naclmore', |
| 56 'linux_clang', | 56 'linux_clang', |
| 57 ] | 57 ] |
| 58 # One of the extra configuration per VM. | 58 # One of the extra configuration per VM. |
| 59 # First the ones barely used. By reducing the number of available slaves, we | 59 # First the ones barely used. By reducing the number of available slaves, we |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 } for index, i in enumerate(gpu_slaves) | 103 } for index, i in enumerate(gpu_slaves) |
| 104 ]) | 104 ]) |
| 105 | 105 |
| 106 # Add Ubuntu 12.04 'precise' slaves. | 106 # Add Ubuntu 12.04 'precise' slaves. |
| 107 result.extend([ | 107 result.extend([ |
| 108 { | 108 { |
| 109 'master': 'TryServer', | 109 'master': 'TryServer', |
| 110 'os': 'linux', | 110 'os': 'linux', |
| 111 'version': 'precise', | 111 'version': 'precise', |
| 112 'bits': '64', | 112 'bits': '64', |
| 113 'builder': 'linux_rel_precise', | 113 'builder': ['linux_precise', 'linux_rel_precise'], |
| 114 'hostname': 'vm%d-m4' % i, | 114 'hostname': 'vm%d-m4' % i, |
| 115 } for index, i in enumerate(precise_slaves) | 115 } for index, i in enumerate(precise_slaves) |
| 116 ]) | 116 ]) |
| 117 | 117 |
| 118 # Add Ubuntu 12.04 'precise32' slaves. | 118 # Add Ubuntu 12.04 'precise32' slaves. |
| 119 result.extend([ | 119 result.extend([ |
| 120 { | 120 { |
| 121 'master': 'TryServer', | 121 'master': 'TryServer', |
| 122 'os': 'linux', | 122 'os': 'linux', |
| 123 'version': 'precise', | 123 'version': 'precise', |
| (...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 499 chromeframe_slave + | 499 chromeframe_slave + |
| 500 gpu_slaves + | 500 gpu_slaves + |
| 501 swarm_slaves + | 501 swarm_slaves + |
| 502 win_tsan_slave + | 502 win_tsan_slave + |
| 503 win_x64_slaves + | 503 win_x64_slaves + |
| 504 swarm_dumb_slaves) | 504 swarm_dumb_slaves) |
| 505 | 505 |
| 506 | 506 |
| 507 slaves = filter(in_service, | 507 slaves = filter(in_service, |
| 508 linux() + mac() + windows() + cros() + android() + ios()) | 508 linux() + mac() + windows() + cros() + android() + ios()) |
| OLD | NEW |