| 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 prefix='vm'): | 8 prefix='vm'): |
| 9 hostname_format = prefix + '%d-m4' if not gce else 'slave%d-c4' | 9 hostname_format = prefix + '%d-m4' if not gce else 'slave%d-c4' |
| 10 return [ | 10 return [ |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 'win_archive', | 51 'win_archive', |
| 52 'win_x64_archive', | 52 'win_x64_archive', |
| 53 # directory: win_upload_clang | 53 # directory: win_upload_clang |
| 54 'win_upload_clang', # Needs to be shorter than 17 chars, crbug.com/600465 | 54 'win_upload_clang', # Needs to be shorter than 17 chars, crbug.com/600465 |
| 55 ] | 55 ] |
| 56 | 56 |
| 57 optional_pool_gn = distribute_slaves( | 57 optional_pool_gn = distribute_slaves( |
| 58 optional_slaves_gn, optional_builders_gn, 'win7', 'win_optional_gn') | 58 optional_slaves_gn, optional_builders_gn, 'win7', 'win_optional_gn') |
| 59 | 59 |
| 60 optional_slaves_chromium = [181, 185, 186, 187, 192] | 60 optional_slaves_chromium = [181, 185, 186, 187, 192] |
| 61 optional_highend_slaves_chromium = [553] | 61 optional_highend_slaves_chromium = [1, 5, 10, 553] |
| 62 | 62 |
| 63 optional_builders_chromium = [ | 63 optional_builders_chromium = [ |
| 64 # directory: win | 64 # directory: win |
| 65 'win_chromium_compile_rel_ng', | 65 'win_chromium_compile_rel_ng', |
| 66 'win_chromium_dbg_ng', | 66 'win_chromium_dbg_ng', |
| 67 'win_chromium_syzyasan_rel', | 67 'win_chromium_syzyasan_rel', |
| 68 'win_optional_gpu_tests_rel', |
| 69 # directory: win_clang |
| 70 'win_chrome_official', |
| 71 # directory: win_nacl_sdk |
| 72 'win_nacl_sdk', |
| 73 # directory: win_nacl_sdk_build |
| 74 'win_nacl_sdk_build', |
| 75 ] |
| 76 |
| 77 # Findit optional builders on high-end machines. |
| 78 optional_builders_chromium_highend = [ |
| 79 # directory: win |
| 68 'win_chromium_variable', | 80 'win_chromium_variable', |
| 69 'win_chromium_variable_clang', | 81 'win_chromium_variable_clang', |
| 70 'win_optional_gpu_tests_rel', | |
| 71 # directory: win_archive | 82 # directory: win_archive |
| 72 'win_chromium_variable_archive', | 83 'win_chromium_variable_archive', |
| 73 # directory: win_chrome | 84 # directory: win_chrome |
| 74 'win_chromium_variable_chrome', | 85 'win_chromium_variable_chrome', |
| 75 # directory: win_clang | |
| 76 'win_chrome_official', | |
| 77 # directory: win_gn | 86 # directory: win_gn |
| 78 'win_chromium_variable_gn', | 87 'win_chromium_variable_gn', |
| 79 # directory: win_layout | 88 # directory: win_layout |
| 80 'win_chromium_variable_webkit_layout', | 89 'win_chromium_variable_webkit_layout', |
| 81 # directory: win_webkit | 90 # directory: win_webkit |
| 82 'win_chromium_variable_webkit_builder', | 91 'win_chromium_variable_webkit_builder', |
| 83 'win_chromium_variable_webkit_win7_builder', | 92 'win_chromium_variable_webkit_win7_builder', |
| 84 # directory: win_nacl_sdk | 93 # directory: win_webkit |
| 85 'win_nacl_sdk', | 94 'win_chromium_variable_webkit_win7_builder_x64', |
| 86 # directory: win_nacl_sdk_build | |
| 87 'win_nacl_sdk_build', | |
| 88 # directory: win_x64 | 95 # directory: win_x64 |
| 89 'win_x64_chromium_variable_builder', | 96 'win_x64_chromium_variable_builder', |
| 90 ] | 97 ] |
| 91 | 98 |
| 92 # Experimental optional builders on high-end machines. | |
| 93 optional_builders_chromium_highend = [ | |
| 94 # directory: win_webkit | |
| 95 'win_chromium_variable_webkit_win7_builder_x64', | |
| 96 ] | |
| 97 | |
| 98 optional_pool_chromium = distribute_slaves( | 99 optional_pool_chromium = distribute_slaves( |
| 99 optional_slaves_chromium, | 100 optional_slaves_chromium, |
| 100 optional_builders_chromium, | 101 optional_builders_chromium, |
| 101 'win7', | 102 'win7', |
| 102 'win_optional_chromium') | 103 'win_optional_chromium') |
| 103 | 104 |
| 104 optional_highend_pool_chromium = distribute_slaves( | 105 optional_highend_pool_chromium = distribute_slaves( |
| 105 optional_highend_slaves_chromium, | 106 optional_highend_slaves_chromium, |
| 106 optional_builders_chromium_highend, | 107 optional_builders_chromium_highend, |
| 107 'win7', | 108 'win7', |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 162 return ( | 163 return ( |
| 163 cq_pool + | 164 cq_pool + |
| 164 optional_pool + | 165 optional_pool + |
| 165 win8_pool + | 166 win8_pool + |
| 166 win_pgo_pool + | 167 win_pgo_pool + |
| 167 clang_win_pool + | 168 clang_win_pool + |
| 168 experimental_pool) | 169 experimental_pool) |
| 169 | 170 |
| 170 | 171 |
| 171 slaves = windows() | 172 slaves = windows() |
| OLD | NEW |