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 hostname_format = 'vm%d-m4' if not gce else 'slave%d-c4' |
| 9 return [ | 9 return [ |
| 10 { | 10 { |
| (...skipping 15 matching lines...) Expand all Loading... | |
| 26 cq_slaves = (range(158, 162) + range(182, 184) + range(231, 234) + | 26 cq_slaves = (range(158, 162) + range(182, 184) + range(231, 234) + |
| 27 range(235, 252) + range(318, 338) + range(399, 407) + | 27 range(235, 252) + range(318, 338) + range(399, 407) + |
| 28 range(422, 425) + range(502, 504) + range(519, 521) + | 28 range(422, 425) + range(502, 504) + range(519, 521) + |
| 29 range(715, 722) + range(750, 782) + range(829, 854) + | 29 range(715, 722) + range(750, 782) + range(829, 854) + |
| 30 range(964, 969) + | 30 range(964, 969) + |
| 31 [197, 202, 224, 228, 341, 426, 497]) | 31 [197, 202, 224, 228, 341, 426, 497]) |
| 32 cq_builders = [ | 32 cq_builders = [ |
| 33 'win_chromium_compile_dbg_ng', | 33 'win_chromium_compile_dbg_ng', |
| 34 'win_chromium_rel_ng', | 34 'win_chromium_rel_ng', |
| 35 'win_chromium_x64_rel_ng', | 35 'win_chromium_x64_rel_ng', |
| 36 'win10_chromium_x64_rel_ng', | |
|
Dirk Pranke
2016/03/28 22:17:13
move this back to the 'win8_builders' pool (i.e.,
Will Harris
2016/03/29 22:36:01
Done.
| |
| 36 ] | 37 ] |
| 37 cq_pool = distribute_slaves(cq_slaves, cq_builders, 'win7', 'win_cq') | 38 cq_pool = distribute_slaves(cq_slaves, cq_builders, 'win7', 'win_cq') |
| 38 | 39 |
| 39 # Optional CQ builders. Split in two groups because of disk size. | 40 # Optional CQ builders. Split in two groups because of disk size. |
| 40 # Builders using the same checkout directory are grouped together | 41 # Builders using the same checkout directory are grouped together |
| 41 # Number of builds per pool is supposed to be roughly balanced. | 42 # Number of builds per pool is supposed to be roughly balanced. |
| 42 optional_slaves_gn = [166, 171, 176, 177] | 43 optional_slaves_gn = [166, 171, 176, 177] |
| 43 optional_builders_gn = [ | 44 optional_builders_gn = [ |
| 44 # directory: win_archive | 45 # directory: win_archive |
| 45 'win_archive', | 46 'win_archive', |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 82 | 83 |
| 83 optional_pool = optional_pool_chromium + optional_pool_gn | 84 optional_pool = optional_pool_chromium + optional_pool_gn |
| 84 | 85 |
| 85 win8_slaves = ([115, 168, 722, 798, 799] + range(384, 399) + | 86 win8_slaves = ([115, 168, 722, 798, 799] + range(384, 399) + |
| 86 range(408, 422) + range(468, 495) + | 87 range(408, 422) + range(468, 495) + |
| 87 range(724, 738) + range(801, 804)) | 88 range(724, 738) + range(801, 804)) |
| 88 win8_builders = [ | 89 win8_builders = [ |
| 89 'win8_chromium_ng', | 90 'win8_chromium_ng', |
| 90 'win8_chromium_gn_dbg', | 91 'win8_chromium_gn_dbg', |
| 91 'win8_chromium_gn_upload', | 92 'win8_chromium_gn_upload', |
| 92 'win10_chromium_rel_ng', # Moved off of GCE for VS 2015 compat | |
| 93 ] | 93 ] |
| 94 win8_pool = distribute_slaves(win8_slaves, win8_builders, 'win8', 'win8') | 94 win8_pool = distribute_slaves(win8_slaves, win8_builders, 'win8', 'win8') |
| 95 | 95 |
| 96 win_pgo_pool = [ | 96 win_pgo_pool = [ |
| 97 { | 97 { |
| 98 'master': 'TryServerChromiumWin', | 98 'master': 'TryServerChromiumWin', |
| 99 'builder': ['win_pgo'], | 99 'builder': ['win_pgo'], |
| 100 'hostname': 'build44-m4', | 100 'hostname': 'build44-m4', |
| 101 'os': 'win', | 101 'os': 'win', |
| 102 'version': 'win7', | 102 'version': 'win7', |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 144 cq_pool + | 144 cq_pool + |
| 145 optional_pool + | 145 optional_pool + |
| 146 win8_pool + | 146 win8_pool + |
| 147 win_pgo_pool + | 147 win_pgo_pool + |
| 148 experimental_pool + | 148 experimental_pool + |
| 149 clang_win_pool + | 149 clang_win_pool + |
| 150 clang_win_cq_pool) | 150 clang_win_cq_pool) |
| 151 | 151 |
| 152 | 152 |
| 153 slaves = windows() | 153 slaves = windows() |
| OLD | NEW |