Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # -*- python -*- | 1 # -*- python -*- |
| 2 # ex: set syntax=python: | 2 # ex: set syntax=python: |
| 3 # Copyright 2014 The Chromium Authors. All rights reserved. | 3 # Copyright 2014 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 def linux(): | 9 def linux(): |
| 10 chromeos_boards = ('x86-generic', 'amd64-generic', 'daisy') | 10 chromeos_boards = ('x86-generic', 'amd64-generic', 'daisy') |
| 11 cq_slaves = (range(111, 131) + range(162, 399) + range(427, 453) + | 11 cq_slaves = (range(111, 131) + range(162, 399) + range(426, 453) + |
| 12 range(493, 497) + range(506, 540) + range(590, 600) + | 12 range(493, 498) + range(506, 540) + range(590, 600) + |
| 13 range(621, 651) + range(779, 799) + range(800, 837) + | 13 range(621, 651) + [776] + range(779, 799) + range(800, 837) + |
| 14 range(841, 864) + range(878, 897) + range(909, 914) + | 14 range(841, 866) + [872] + range(878, 897) + range(909, 914) + |
| 15 range(1010, 1029)) | 15 range(1010, 1029) + range(1069, 1098)) |
| 16 cq_builders = [ | 16 cq_builders = [ |
| 17 'blimp_linux_dbg', | 17 'blimp_linux_dbg', |
| 18 'cast_shell_linux', | 18 'cast_shell_linux', |
| 19 'chromium_devtools', | 19 'chromium_devtools', |
| 20 'chromium_presubmit', | 20 'chromium_presubmit', |
| 21 'linux_chromium_archive_rel_ng', | 21 'linux_chromium_archive_rel_ng', |
| 22 'linux_chromium_asan_rel_ng', | 22 'linux_chromium_asan_rel_ng', |
| 23 'linux_chromium_chromeos_asan_rel_ng', | 23 'linux_chromium_chromeos_asan_rel_ng', |
| 24 'linux_chromium_chromeos_compile_dbg_ng', | 24 'linux_chromium_chromeos_compile_dbg_ng', |
| 25 'linux_chromium_chromeos_ozone_rel_ng', | 25 'linux_chromium_chromeos_ozone_rel_ng', |
| 26 'linux_chromium_chromeos_rel_ng', | 26 'linux_chromium_chromeos_rel_ng', |
| 27 'linux_chromium_clobber_rel_ng', | 27 'linux_chromium_clobber_rel_ng', |
| 28 'linux_chromium_compile_dbg_ng', | 28 'linux_chromium_compile_dbg_ng', |
| 29 'linux_chromium_gn_chromeos_dbg', | 29 'linux_chromium_gn_chromeos_dbg', |
| 30 'linux_chromium_gn_chromeos_rel', | 30 'linux_chromium_gn_chromeos_rel', |
| 31 'linux_chromium_headless_dbg', | |
| 31 'linux_chromium_rel_ng', | 32 'linux_chromium_rel_ng', |
| 32 ] | 33 ] |
| 33 cq_builders += [ | 34 cq_builders += [ |
| 34 'chromeos_%s_chromium_compile_only_ng' % (board,) | 35 'chromeos_%s_chromium_compile_only_ng' % (board,) |
| 35 for board in chromeos_boards | 36 for board in chromeos_boards |
| 36 ] | 37 ] |
| 37 | 38 |
| 38 # Slave pools have two competing constraints: | 39 # Slave pools have two competing constraints: |
| 39 # - load: peak number of concurrent builds. Larger pools are safer. | 40 # - load: peak number of concurrent builds. Larger pools are safer. |
| 40 # - disk space: too many builders on the same pool will exhaust | 41 # - disk space: too many builders on the same pool will exhaust |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 108 'linux_chromium_webkit_msan_variable', # linux_layout_msan | 109 'linux_chromium_webkit_msan_variable', # linux_layout_msan |
| 109 'linux_chromium_webkit_variable', # linux_layout | 110 'linux_chromium_webkit_variable', # linux_layout |
| 110 ] | 111 ] |
| 111 | 112 |
| 112 # Set up normal slaves. | 113 # Set up normal slaves. |
| 113 result = [] | 114 result = [] |
| 114 for i, slave in enumerate(cq_slaves): | 115 for i, slave in enumerate(cq_slaves): |
| 115 result.append({ | 116 result.append({ |
| 116 'master': 'TryServerChromiumLinux', | 117 'master': 'TryServerChromiumLinux', |
| 117 'os': 'linux', | 118 'os': 'linux', |
| 118 'version': 'precise', | 119 'version': 'precise', |
|
perezju
2016/09/12 14:00:27
I'm a bit confused about this bit here, the slaves
Dirk Pranke
2016/09/12 18:45:20
Yup. What you have here is wrong, because it'll mi
| |
| 119 'bits': '64', | 120 'bits': '64', |
| 120 'builder': cq_builders, | 121 'builder': cq_builders, |
| 121 'preferred_builder': cq_builders[i % len(cq_builders)], | 122 'preferred_builder': cq_builders[i % len(cq_builders)], |
| 122 'hostname': 'slave%d-c4' % slave, | 123 'hostname': 'slave%d-c4' % slave, |
| 123 'pool': 'linux_cq', | 124 'pool': 'linux_cq', |
| 124 }) | 125 }) |
| 125 for slave in optional_slaves1: | 126 for slave in optional_slaves1: |
| 126 result.append({ | 127 result.append({ |
| 127 'master': 'TryServerChromiumLinux', | 128 'master': 'TryServerChromiumLinux', |
| 128 'os': 'linux', | 129 'os': 'linux', |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 185 'builder': ['linux_layout_tests_slimming_paint_v2'], | 186 'builder': ['linux_layout_tests_slimming_paint_v2'], |
| 186 'hostname': 'slave775-c4', | 187 'hostname': 'slave775-c4', |
| 187 'pool': 'linux_layout_tests_slimming_paint_v2', | 188 'pool': 'linux_layout_tests_slimming_paint_v2', |
| 188 } | 189 } |
| 189 ]) | 190 ]) |
| 190 | 191 |
| 191 return result | 192 return result |
| 192 | 193 |
| 193 | 194 |
| 194 slaves = linux() | 195 slaves = linux() |
| OLD | NEW |