| 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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 62 'linux_chromium_variable', | 62 'linux_chromium_variable', |
| 63 'linux_chromium_variable_32', | 63 'linux_chromium_variable_32', |
| 64 'linux_chromium_variable_32_chrome', | 64 'linux_chromium_variable_32_chrome', |
| 65 'linux_chromium_variable_32_clobber', | 65 'linux_chromium_variable_32_clobber', |
| 66 'linux_chromium_variable_chrome', | 66 'linux_chromium_variable_chrome', |
| 67 'linux_chromium_variable_clobber', | 67 'linux_chromium_variable_clobber', |
| 68 'linux_chromium_webkit_asan_variable', | 68 'linux_chromium_webkit_asan_variable', |
| 69 'linux_chromium_webkit_leak_variable', | 69 'linux_chromium_webkit_leak_variable', |
| 70 'linux_chromium_webkit_msan_variable', | 70 'linux_chromium_webkit_msan_variable', |
| 71 'linux_chromium_webkit_variable', | 71 'linux_chromium_webkit_variable', |
| 72 'linux_chromiumos_full_variable', |
| 72 'linux_nacl_sdk', | 73 'linux_nacl_sdk', |
| 73 'linux_nacl_sdk_build', | 74 'linux_nacl_sdk_build', |
| 74 'linux_optional_gpu_tests_rel', | 75 'linux_optional_gpu_tests_rel', |
| 75 'linux_site_isolation', | 76 'linux_site_isolation', |
| 76 ] | 77 ] |
| 77 | 78 |
| 78 # Super beefy machines. | 79 # Super beefy machines. |
| 79 optional_highmem_slaves = [904, 905] | 80 optional_highmem_slaves = [904, 905] |
| 80 optional_highmem_builders = [ | 81 optional_highmem_builders = [ |
| 81 'linux_upload_clang', | 82 'linux_upload_clang', |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 'builder': ['linux_chromium_browser_side_navigation_rel'], | 127 'builder': ['linux_chromium_browser_side_navigation_rel'], |
| 127 'hostname': 'slave914-c4', | 128 'hostname': 'slave914-c4', |
| 128 'pool': 'linux_chromium_browser_side_navigation_rel', | 129 'pool': 'linux_chromium_browser_side_navigation_rel', |
| 129 } | 130 } |
| 130 ]) | 131 ]) |
| 131 | 132 |
| 132 return result | 133 return result |
| 133 | 134 |
| 134 | 135 |
| 135 slaves = linux() | 136 slaves = linux() |
| OLD | NEW |