| 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 # See master.experimental/slaves.cfg for documentation. | 7 # See master.experimental/slaves.cfg for documentation. |
| 8 | 8 |
| 9 def linux(): | 9 def linux(): |
| 10 chromeos_boards = ('x86-generic', 'amd64-generic', 'daisy') | 10 chromeos_boards = ('x86-generic', 'amd64-generic', 'daisy') |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 'ChromiumOS Codesearch Builder', # ChromiumOS_Codesearch_Builder | 52 'ChromiumOS Codesearch Builder', # ChromiumOS_Codesearch_Builder |
| 53 'closure_compilation', # linux | 53 'closure_compilation', # linux |
| 54 'linux_chromium_chromeos_compile_rel_ng', # linux_chromeos | 54 'linux_chromium_chromeos_compile_rel_ng', # linux_chromeos |
| 55 'linux_chromium_chromeos_dbg_ng', # linux_chromeos | 55 'linux_chromium_chromeos_dbg_ng', # linux_chromeos |
| 56 'linux_chromium_chromeos_variable', # linux_chromeos | 56 'linux_chromium_chromeos_variable', # linux_chromeos |
| 57 'linux_chromium_compile_dbg_32_ng', # linux | 57 'linux_chromium_compile_dbg_32_ng', # linux |
| 58 'linux_chromium_compile_rel_ng', # linux | 58 'linux_chromium_compile_rel_ng', # linux |
| 59 'linux_chromium_dbg_ng', # linux | 59 'linux_chromium_dbg_ng', # linux |
| 60 'linux_chromium_dbg_32_ng', # linux | 60 'linux_chromium_dbg_32_ng', # linux |
| 61 'linux_chromium_msan_rel_ng', # linux_msan | 61 'linux_chromium_msan_rel_ng', # linux_msan |
| 62 'linux_chromium_variable', # linux | |
| 63 'linux_chromiumos_full_variable', # linux_chromeos | 62 'linux_chromiumos_full_variable', # linux_chromeos |
| 64 'linux_site_isolation', # linux | 63 'linux_site_isolation', # linux |
| 65 ] | 64 ] |
| 66 # Contains all the optional builders with smaller slavebuilddir not | 65 # Contains all the optional builders with smaller slavebuilddir not |
| 67 # covered by optional_builders1. | 66 # covered by optional_builders1. |
| 68 optional_builders2 = [ | 67 optional_builders2 = [ |
| 69 'chromeos_%s_variable' % (board,) # chromeos_<board> | 68 'chromeos_%s_variable' % (board,) # chromeos_<board> |
| 70 for board in chromeos_boards | 69 for board in chromeos_boards |
| 71 ] | 70 ] |
| 72 optional_builders2 += [ | 71 optional_builders2 += [ |
| (...skipping 20 matching lines...) Expand all Loading... |
| 93 'linux_optional_gpu_tests_rel', # linux_nacl_sdk_build | 92 'linux_optional_gpu_tests_rel', # linux_nacl_sdk_build |
| 94 ] | 93 ] |
| 95 | 94 |
| 96 # Super beefy machines. | 95 # Super beefy machines. |
| 97 optional_highmem_slaves = [904, 905] | 96 optional_highmem_slaves = [904, 905] |
| 98 optional_highmem_builders = [ | 97 optional_highmem_builders = [ |
| 99 'linux_upload_clang', | 98 'linux_upload_clang', |
| 100 'linux_chromium_cfi_rel_ng', | 99 'linux_chromium_cfi_rel_ng', |
| 101 ] | 100 ] |
| 102 | 101 |
| 102 # High-cpu slaves for dedicated use by Findit. |
| 103 optional_highcpu_slaves = [799] |
| 104 optional_highcpu_builders = [ # slavebuilddir |
| 105 'linux_chromium_variable', # linux |
| 106 ] |
| 107 |
| 103 # Set up normal slaves. | 108 # Set up normal slaves. |
| 104 result = [] | 109 result = [] |
| 105 for i, slave in enumerate(cq_slaves): | 110 for i, slave in enumerate(cq_slaves): |
| 106 result.append({ | 111 result.append({ |
| 107 'master': 'TryServerChromiumLinux', | 112 'master': 'TryServerChromiumLinux', |
| 108 'os': 'linux', | 113 'os': 'linux', |
| 109 'version': 'precise', | 114 'version': 'precise', |
| 110 'bits': '64', | 115 'bits': '64', |
| 111 'builder': cq_builders, | 116 'builder': cq_builders, |
| 112 'preferred_builder': cq_builders[i % len(cq_builders)], | 117 'preferred_builder': cq_builders[i % len(cq_builders)], |
| (...skipping 23 matching lines...) Expand all Loading... |
| 136 for slave in optional_highmem_slaves: | 141 for slave in optional_highmem_slaves: |
| 137 result.append({ | 142 result.append({ |
| 138 'master': 'TryServerChromiumLinux', | 143 'master': 'TryServerChromiumLinux', |
| 139 'os': 'linux', | 144 'os': 'linux', |
| 140 'version': 'precise', | 145 'version': 'precise', |
| 141 'bits': '64', | 146 'bits': '64', |
| 142 'builder': optional_highmem_builders, | 147 'builder': optional_highmem_builders, |
| 143 'hostname': 'slave%d-c4' % slave, | 148 'hostname': 'slave%d-c4' % slave, |
| 144 'pool': 'linux_optional_highmem', | 149 'pool': 'linux_optional_highmem', |
| 145 }) | 150 }) |
| 151 for slave in optional_highcpu_slaves: |
| 152 result.append({ |
| 153 'master': 'TryServerChromiumLinux', |
| 154 'os': 'linux', |
| 155 'version': 'precise', |
| 156 'bits': '64', |
| 157 'builder': optional_highcpu_builders, |
| 158 'hostname': 'slave%d-c4' % slave, |
| 159 'pool': 'linux_optional_highcpu', |
| 160 }) |
| 146 | 161 |
| 147 # Bot for linux_chromium_browser_side_navigation_rel. | 162 # Bot for linux_chromium_browser_side_navigation_rel. |
| 148 result.extend([ | 163 result.extend([ |
| 149 { | 164 { |
| 150 'master': 'TryServerChromiumLinux', | 165 'master': 'TryServerChromiumLinux', |
| 151 'os': 'linux', | 166 'os': 'linux', |
| 152 'version': 'precise', | 167 'version': 'precise', |
| 153 'bits': '64', | 168 'bits': '64', |
| 154 'builder': ['linux_chromium_browser_side_navigation_rel'], | 169 'builder': ['linux_chromium_browser_side_navigation_rel'], |
| 155 'hostname': 'slave914-c4', | 170 'hostname': 'slave914-c4', |
| 156 'pool': 'linux_chromium_browser_side_navigation_rel', | 171 'pool': 'linux_chromium_browser_side_navigation_rel', |
| 157 } | 172 } |
| 158 ]) | 173 ]) |
| 159 | 174 |
| 160 return result | 175 return result |
| 161 | 176 |
| 162 | 177 |
| 163 slaves = linux() | 178 slaves = linux() |
| OLD | NEW |