| 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 def distribute_slaves(slave_numbers, builders, os_ver, pool=None, gce=False): | 7 def distribute_slaves(slave_numbers, builders, os_ver, pool=None, gce=False): |
| 8 hostname_format = 'vm%d-m4' if not gce else 'slave%d-c4' | 8 hostname_format = 'vm%d-m4' if not gce else 'slave%d-c4' |
| 9 return [ | 9 return [ |
| 10 { | 10 { |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 optional_pool_gn = distribute_slaves( | 53 optional_pool_gn = distribute_slaves( |
| 54 optional_slaves_gn, optional_builders_gn, 'win7', 'win_optional_gn') | 54 optional_slaves_gn, optional_builders_gn, 'win7', 'win_optional_gn') |
| 55 | 55 |
| 56 optional_slaves_chromium = [181, 185, 186, 187, 192] | 56 optional_slaves_chromium = [181, 185, 186, 187, 192] |
| 57 optional_builders_chromium = [ | 57 optional_builders_chromium = [ |
| 58 # directory: win | 58 # directory: win |
| 59 'win_chromium_compile_rel_ng', | 59 'win_chromium_compile_rel_ng', |
| 60 'win_chromium_dbg_ng', | 60 'win_chromium_dbg_ng', |
| 61 'win_chromium_syzyasan_rel', | 61 'win_chromium_syzyasan_rel', |
| 62 'win_chromium_variable', | 62 'win_chromium_variable', |
| 63 'win_chromium_variable_clang', |
| 63 'win_optional_gpu_tests_rel', | 64 'win_optional_gpu_tests_rel', |
| 64 # directory: win_archive | 65 # directory: win_archive |
| 65 'win_chromium_variable_archive', | 66 'win_chromium_variable_archive', |
| 66 # directory: win_chrome | 67 # directory: win_chrome |
| 67 'win_chromium_variable_chrome', | 68 'win_chromium_variable_chrome', |
| 69 # directory: win_clang |
| 68 'win_chrome_official', | 70 'win_chrome_official', |
| 69 # directory: win_gn | 71 # directory: win_gn |
| 70 'win_chromium_variable_gn', | 72 'win_chromium_variable_gn', |
| 71 # directory: win_layout | 73 # directory: win_layout |
| 72 'win_chromium_variable_webkit_layout', | 74 'win_chromium_variable_webkit_layout', |
| 73 # directory: win_webkit | 75 # directory: win_webkit |
| 74 'win_chromium_variable_webkit_builder', | 76 'win_chromium_variable_webkit_builder', |
| 75 'win_chromium_variable_webkit_win7_builder', | 77 'win_chromium_variable_webkit_win7_builder', |
| 76 'win_chromium_variable_webkit_win7_builder_x64', | 78 'win_chromium_variable_webkit_win7_builder_x64', |
| 77 # directory: win_nacl_sdk | 79 # directory: win_nacl_sdk |
| 78 'win_nacl_sdk', | 80 'win_nacl_sdk', |
| 79 # directory: win_nacl_sdk_build | 81 # directory: win_nacl_sdk_build |
| 80 'win_nacl_sdk_build', | 82 'win_nacl_sdk_build', |
| 83 # directory: win_x64 |
| 84 'win_x64_chromium_variable_builder', |
| 81 ] | 85 ] |
| 82 optional_pool_chromium = distribute_slaves( | 86 optional_pool_chromium = distribute_slaves( |
| 83 optional_slaves_chromium, | 87 optional_slaves_chromium, |
| 84 optional_builders_chromium, | 88 optional_builders_chromium, |
| 85 'win7', | 89 'win7', |
| 86 'win_optional_chromium') | 90 'win_optional_chromium') |
| 87 | 91 |
| 88 optional_pool = optional_pool_chromium + optional_pool_gn | 92 optional_pool = optional_pool_chromium + optional_pool_gn |
| 89 | 93 |
| 90 win8_slaves = ([115, 168, 722, 798, 799] + range(384, 399) + | 94 win8_slaves = ([115, 168, 722, 798, 799] + range(384, 399) + |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 140 return ( | 144 return ( |
| 141 cq_pool + | 145 cq_pool + |
| 142 optional_pool + | 146 optional_pool + |
| 143 win8_pool + | 147 win8_pool + |
| 144 win_pgo_pool + | 148 win_pgo_pool + |
| 145 clang_win_pool + | 149 clang_win_pool + |
| 146 experimental_pool) | 150 experimental_pool) |
| 147 | 151 |
| 148 | 152 |
| 149 slaves = windows() | 153 slaves = windows() |
| OLD | NEW |