| OLD | NEW |
| 1 # -*- python -*- | 1 # -*- python -*- |
| 2 # ex: set syntax=python: | 2 # ex: set syntax=python: |
| 3 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 3 # Copyright (c) 2011 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 | 9 |
| 10 def linux(): | 10 def linux(): |
| 11 """Linux VMs can hold a maximum of 4 checkouts per slave.""" | 11 """Linux VMs can hold a maximum of 4 checkouts per slave.""" |
| 12 | 12 |
| 13 normal_slaves = sorted( | 13 normal_slaves = sorted( |
| 14 range(60, 68) + range(121, 166) + [46, 57, 79, 86, 104, 113]) | 14 range(60, 68) + range(121, 166) + [46, 57, 79, 86, 104, 113]) |
| 15 touch_slave = 112 | 15 touch_slave = 112 |
| 16 | 16 |
| 17 # Configurations on every VM. | 17 # Configurations on every VM. |
| 18 base = [ | 18 base = [ |
| 19 # One line per shared directory. In decreasing usage: | 19 # One line per shared directory. In decreasing usage: |
| 20 'linux', 'linux_rel', 'linux_sync', | 20 'linux', 'linux_dbg', 'linux_sync', |
| 21 'linux_clang', | 21 'linux_clang', |
| 22 'linux_chromeos', | 22 'linux_chromeos', |
| 23 ] | 23 ] |
| 24 # One of the extra configuration per VM. | 24 # One of the extra configuration per VM. |
| 25 extras = [ | 25 extras = [ |
| 26 # First the ones barely used. | 26 # First the ones barely used. |
| 27 [['linux_chromeos_valgrind'], 2], | 27 [['linux_chromeos_valgrind'], 2], |
| 28 [['linux_coverage'], 2], | 28 [['linux_coverage'], 2], |
| 29 [['linux_valgrind', 'linux_tsan'], 5], | 29 [['linux_valgrind', 'linux_tsan'], 5], |
| 30 [['linux_shared'], 5], | 30 [['linux_shared'], 5], |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 62 }) | 62 }) |
| 63 return result | 63 return result |
| 64 | 64 |
| 65 | 65 |
| 66 def mac(): | 66 def mac(): |
| 67 return [ | 67 return [ |
| 68 { | 68 { |
| 69 'master': 'TryServer', | 69 'master': 'TryServer', |
| 70 'builder': [ | 70 'builder': [ |
| 71 # One line per shared directory: | 71 # One line per shared directory: |
| 72 'mac', 'mac_rel', 'mac_sync', | 72 'mac', 'mac_dbg', 'mac_sync', |
| 73 'mac_layout', 'mac_layout_rel', | 73 'mac_layout', 'mac_layout_rel', |
| 74 'mac_valgrind', | 74 'mac_valgrind', |
| 75 'mac_clang_no_goma', | 75 'mac_clang_no_goma', |
| 76 ], | 76 ], |
| 77 'hostname': 'mini%d-m4' % i, | 77 'hostname': 'mini%d-m4' % i, |
| 78 'os': 'mac', | 78 'os': 'mac', |
| 79 'version': '10.6', | 79 'version': '10.6', |
| 80 'bits': '64', | 80 'bits': '64', |
| 81 } for i in sorted( | 81 } for i in sorted( |
| 82 range(1, 26) + [29] + range(32, 46) + range(102, 112)) | 82 range(1, 26) + [29] + range(32, 46) + range(102, 112)) |
| 83 ] | 83 ] |
| 84 | 84 |
| 85 | 85 |
| 86 def windows(): | 86 def windows(): |
| 87 slaves = sorted( | 87 slaves = sorted( |
| 88 range(1, 36) + range(68, 71) + range(80, 85) + [41, 42] + range(47, 55)) | 88 range(1, 36) + range(68, 71) + range(80, 85) + [41, 42] + range(47, 55)) |
| 89 return [ | 89 return [ |
| 90 { | 90 { |
| 91 'master': 'TryServer', | 91 'master': 'TryServer', |
| 92 'builder': ['win', 'win_rel', 'win_sync', 'win_shared'], | 92 'builder': ['win', 'win_dbg', 'win_sync', 'win_shared'], |
| 93 'hostname': 'vm%d-m4' % i, | 93 'hostname': 'vm%d-m4' % i, |
| 94 'os': 'win', | 94 'os': 'win', |
| 95 'version': 'vista', | 95 'version': 'vista', |
| 96 'bits': '64', | 96 'bits': '64', |
| 97 } for i in slaves | 97 } for i in slaves |
| 98 ] + [ | 98 ] + [ |
| 99 # TODO(maruel): Move these to Vista or 7? | 99 # TODO(maruel): Move these to Vista or 7? |
| 100 { | 100 { |
| 101 'master': 'TryServer', | 101 'master': 'TryServer', |
| 102 'builder': ['win_layout', 'win_layout_rel'], | 102 'builder': ['win_layout', 'win_layout_rel'], |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 138 'builder': 'cros_x86', | 138 'builder': 'cros_x86', |
| 139 'hostname': 'build%d-m4' % i, | 139 'hostname': 'build%d-m4' % i, |
| 140 'os': 'linux', | 140 'os': 'linux', |
| 141 'version': 'lucid', | 141 'version': 'lucid', |
| 142 'bits': '64', | 142 'bits': '64', |
| 143 } for i in (1, 2, 4, 5, 6) | 143 } for i in (1, 2, 4, 5, 6) |
| 144 ] | 144 ] |
| 145 | 145 |
| 146 | 146 |
| 147 slaves = linux() + mac() + windows() + arm() + cros() | 147 slaves = linux() + mac() + windows() + arm() + cros() |
| OLD | NEW |