| 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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 'closure_compilation', # linux | 56 'closure_compilation', # linux |
| 57 'linux_chromium_chromeos_compile_rel_ng', # linux_chromeos | 57 'linux_chromium_chromeos_compile_rel_ng', # linux_chromeos |
| 58 'linux_chromium_chromeos_dbg_ng', # linux_chromeos | 58 'linux_chromium_chromeos_dbg_ng', # linux_chromeos |
| 59 'linux_chromium_chromeos_variable', # linux_chromeos | 59 'linux_chromium_chromeos_variable', # linux_chromeos |
| 60 'linux_chromium_compile_dbg_32_ng', # linux | 60 'linux_chromium_compile_dbg_32_ng', # linux |
| 61 'linux_chromium_compile_rel_ng', # linux | 61 'linux_chromium_compile_rel_ng', # linux |
| 62 'linux_chromium_dbg_ng', # linux | 62 'linux_chromium_dbg_ng', # linux |
| 63 'linux_chromium_dbg_32_ng', # linux | 63 'linux_chromium_dbg_32_ng', # linux |
| 64 'linux_chromium_msan_rel_ng', # linux_msan | 64 'linux_chromium_msan_rel_ng', # linux_msan |
| 65 'linux_chromiumos_full_variable', # linux_chromeos | 65 'linux_chromiumos_full_variable', # linux_chromeos |
| 66 'linux_chromium_ozone_compile_only_ng', # linux |
| 66 'linux_site_isolation', # linux | 67 'linux_site_isolation', # linux |
| 67 'linux_chromium_browser_side_navigation_rel', # linux | 68 'linux_chromium_browser_side_navigation_rel', # linux |
| 68 ] | 69 ] |
| 69 # Contains all the optional builders with smaller slavebuilddir not | 70 # Contains all the optional builders with smaller slavebuilddir not |
| 70 # covered by optional_builders1. | 71 # covered by optional_builders1. |
| 71 optional_builders2 = [ | 72 optional_builders2 = [ |
| 72 'chromeos_%s_variable' % (board,) # chromeos_<board> | 73 'chromeos_%s_variable' % (board,) # chromeos_<board> |
| 73 for board in chromeos_boards | 74 for board in chromeos_boards |
| 74 ] | 75 ] |
| 75 optional_builders2 += [ | 76 optional_builders2 += [ |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 186 'bits': 64, | 187 'bits': 64, |
| 187 'builder': ['linux_chromium_headless_rel'], | 188 'builder': ['linux_chromium_headless_rel'], |
| 188 'hostname': 'slave%d-c4' % slave, | 189 'hostname': 'slave%d-c4' % slave, |
| 189 'pool': 'linux_chromium_headless_rel', | 190 'pool': 'linux_chromium_headless_rel', |
| 190 }) | 191 }) |
| 191 | 192 |
| 192 return result | 193 return result |
| 193 | 194 |
| 194 | 195 |
| 195 slaves = linux() | 196 slaves = linux() |
| OLD | NEW |