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 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 build=False): |
|
Sergey Berezin
2016/07/26 00:14:44
nit: this may be better served by prefix='vm', and
lijeffrey
2016/07/26 01:17:00
Cool. I'll go with the prefix='vm' route in case w
| |
| 9 if build: | |
| 10 hostname_format = 'build%d-m4' | |
| 11 else: | |
| 12 hostname_format = 'vm%d-m4' if not gce else 'slave%d-c4' | |
| 13 | |
| 9 return [ | 14 return [ |
| 10 { | 15 { |
| 11 'master': 'TryServerChromiumWin', | 16 'master': 'TryServerChromiumWin', |
| 12 'builder': builders, | 17 'builder': builders, |
| 13 'preferred_builder': (builders[i % len(builders)] | 18 'preferred_builder': (builders[i % len(builders)] |
| 14 if slave_numbers >= builders | 19 if slave_numbers >= builders |
| 15 else None), | 20 else None), |
| 16 'hostname': hostname_format % number, | 21 'hostname': hostname_format % number, |
| 17 'os': 'win', | 22 'os': 'win', |
| 18 'version': os_ver, | 23 'version': os_ver, |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 50 'win_archive', | 55 'win_archive', |
| 51 'win_x64_archive', | 56 'win_x64_archive', |
| 52 # directory: win_upload_clang | 57 # directory: win_upload_clang |
| 53 'win_upload_clang', # Needs to be shorter than 17 chars, crbug.com/600465 | 58 'win_upload_clang', # Needs to be shorter than 17 chars, crbug.com/600465 |
| 54 ] | 59 ] |
| 55 | 60 |
| 56 optional_pool_gn = distribute_slaves( | 61 optional_pool_gn = distribute_slaves( |
| 57 optional_slaves_gn, optional_builders_gn, 'win7', 'win_optional_gn') | 62 optional_slaves_gn, optional_builders_gn, 'win7', 'win_optional_gn') |
| 58 | 63 |
| 59 optional_slaves_chromium = [181, 185, 186, 187, 192] | 64 optional_slaves_chromium = [181, 185, 186, 187, 192] |
| 65 optional_high_end_slaves_chromium = [533] | |
| 66 | |
| 60 optional_builders_chromium = [ | 67 optional_builders_chromium = [ |
| 61 # directory: win | 68 # directory: win |
| 62 'win_chromium_compile_rel_ng', | 69 'win_chromium_compile_rel_ng', |
| 63 'win_chromium_dbg_ng', | 70 'win_chromium_dbg_ng', |
| 64 'win_chromium_syzyasan_rel', | 71 'win_chromium_syzyasan_rel', |
| 65 'win_chromium_variable', | 72 'win_chromium_variable', |
| 66 'win_chromium_variable_clang', | 73 'win_chromium_variable_clang', |
| 67 'win_optional_gpu_tests_rel', | 74 'win_optional_gpu_tests_rel', |
| 68 # directory: win_archive | 75 # directory: win_archive |
| 69 'win_chromium_variable_archive', | 76 'win_chromium_variable_archive', |
| 70 # directory: win_chrome | 77 # directory: win_chrome |
| 71 'win_chromium_variable_chrome', | 78 'win_chromium_variable_chrome', |
| 72 # directory: win_clang | 79 # directory: win_clang |
| 73 'win_chrome_official', | 80 'win_chrome_official', |
| 74 # directory: win_gn | 81 # directory: win_gn |
| 75 'win_chromium_variable_gn', | 82 'win_chromium_variable_gn', |
| 76 # directory: win_layout | 83 # directory: win_layout |
| 77 'win_chromium_variable_webkit_layout', | 84 'win_chromium_variable_webkit_layout', |
| 78 # directory: win_webkit | 85 # directory: win_webkit |
| 79 'win_chromium_variable_webkit_builder', | 86 'win_chromium_variable_webkit_builder', |
| 80 'win_chromium_variable_webkit_win7_builder', | 87 'win_chromium_variable_webkit_win7_builder', |
| 81 'win_chromium_variable_webkit_win7_builder_x64', | |
| 82 # directory: win_nacl_sdk | 88 # directory: win_nacl_sdk |
| 83 'win_nacl_sdk', | 89 'win_nacl_sdk', |
| 84 # directory: win_nacl_sdk_build | 90 # directory: win_nacl_sdk_build |
| 85 'win_nacl_sdk_build', | 91 'win_nacl_sdk_build', |
| 86 # directory: win_x64 | 92 # directory: win_x64 |
| 87 'win_x64_chromium_variable_builder', | 93 'win_x64_chromium_variable_builder', |
| 88 ] | 94 ] |
| 95 | |
| 96 # Experimental optional builders on high-end machines. | |
| 97 optional_builders_chromium_2 = [ | |
| 98 # directory: win_webkit | |
| 99 'win_chromium_variable_webkit_win7_builder_x64', | |
| 100 ] | |
| 101 | |
| 89 optional_pool_chromium = distribute_slaves( | 102 optional_pool_chromium = distribute_slaves( |
| 90 optional_slaves_chromium, | 103 optional_slaves_chromium, |
| 91 optional_builders_chromium, | 104 optional_builders_chromium, |
| 92 'win7', | 105 'win7', |
| 93 'win_optional_chromium') | 106 'win_optional_chromium') |
| 94 | 107 |
| 95 optional_pool = optional_pool_chromium + optional_pool_gn | 108 optional_high_end_pool_chromium = distribute_slaves( |
| 109 optional_high_end_slaves_chromium, | |
| 110 optional_builders_chromium_2, | |
| 111 'win7', | |
| 112 'win_optional_chromium', | |
|
Sergey Berezin
2016/07/26 00:14:44
Please create a unique pool name, e.g. 'win_option
lijeffrey
2016/07/26 01:17:00
Done.
| |
| 113 build=True) | |
| 114 | |
| 115 optional_pool = (optional_pool_chromium + optional_high_end_pool_chromium + | |
| 116 optional_pool_gn) | |
| 96 | 117 |
| 97 win8_slaves = ([115, 168, 722, 798, 799] + range(384, 399) + | 118 win8_slaves = ([115, 168, 722, 798, 799] + range(384, 399) + |
| 98 range(408, 422) + range(468, 495) + | 119 range(408, 422) + range(468, 495) + |
| 99 range(724, 738) + range(801, 804)) | 120 range(724, 738) + range(801, 804)) |
| 100 win8_builders = [ | 121 win8_builders = [ |
| 101 'win8_chromium_gyp_rel', | 122 'win8_chromium_gyp_rel', |
| 102 'win8_chromium_gyp_dbg', | 123 'win8_chromium_gyp_dbg', |
| 103 'win8_chromium_gn_upload', | 124 'win8_chromium_gn_upload', |
| 104 'win10_chromium_x64_rel_ng', | 125 'win10_chromium_x64_rel_ng', |
| 105 ] | 126 ] |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 147 return ( | 168 return ( |
| 148 cq_pool + | 169 cq_pool + |
| 149 optional_pool + | 170 optional_pool + |
| 150 win8_pool + | 171 win8_pool + |
| 151 win_pgo_pool + | 172 win_pgo_pool + |
| 152 clang_win_pool + | 173 clang_win_pool + |
| 153 experimental_pool) | 174 experimental_pool) |
| 154 | 175 |
| 155 | 176 |
| 156 slaves = windows() | 177 slaves = windows() |
| OLD | NEW |