| 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 97 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 108       'win_optional_highend', | 108       'win_optional_highend', | 
| 109       prefix='build') | 109       prefix='build') | 
| 110 | 110 | 
| 111   optional_pool = (optional_pool_chromium + optional_highend_pool_chromium + | 111   optional_pool = (optional_pool_chromium + optional_highend_pool_chromium + | 
| 112       optional_pool_gn) | 112       optional_pool_gn) | 
| 113 | 113 | 
| 114   win8_slaves = ([115, 168, 722, 798, 799] + range(384, 399) + | 114   win8_slaves = ([115, 168, 722, 798, 799] + range(384, 399) + | 
| 115       range(408, 422) + range(468, 495) + | 115       range(408, 422) + range(468, 495) + | 
| 116       range(724, 738) + range(801, 804)) | 116       range(724, 738) + range(801, 804)) | 
| 117   win8_builders = [ | 117   win8_builders = [ | 
| 118       'win8_chromium_gyp_rel', |  | 
| 119       'win8_chromium_gyp_dbg', |  | 
| 120       'win8_chromium_gn_upload', | 118       'win8_chromium_gn_upload', | 
| 121       'win10_chromium_x64_rel_ng', | 119       'win10_chromium_x64_rel_ng', | 
| 122   ] | 120   ] | 
| 123   win8_pool = distribute_slaves(win8_slaves, win8_builders, 'win8', 'win8') | 121   win8_pool = distribute_slaves(win8_slaves, win8_builders, 'win8', 'win8') | 
| 124 | 122 | 
| 125   win_pgo_pool = [ | 123   win_pgo_pool = [ | 
| 126     { | 124     { | 
| 127       'master': 'TryServerChromiumWin', | 125       'master': 'TryServerChromiumWin', | 
| 128       'builder': ['win_pgo'], | 126       'builder': ['win_pgo'], | 
| 129       'hostname': 'build44-m4', | 127       'hostname': 'build44-m4', | 
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 164   return ( | 162   return ( | 
| 165       cq_pool + | 163       cq_pool + | 
| 166       optional_pool + | 164       optional_pool + | 
| 167       win8_pool + | 165       win8_pool + | 
| 168       win_pgo_pool + | 166       win_pgo_pool + | 
| 169       clang_win_pool + | 167       clang_win_pool + | 
| 170       experimental_pool) | 168       experimental_pool) | 
| 171 | 169 | 
| 172 | 170 | 
| 173 slaves = windows() | 171 slaves = windows() | 
| OLD | NEW | 
|---|