| OLD | NEW |
| 1 # -*- python -*- | 1 # -*- python -*- |
| 2 # ex: set syntax=python: | 2 # ex: set syntax=python: |
| 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 3 # Copyright (c) 2012 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 | 9 |
| 10 def expand_extra_builders(extras, total): | 10 def expand_extra_builders(extras, total): |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 # Have a dedicated pool for presubmit jobs - all CQ jobs | 39 # Have a dedicated pool for presubmit jobs - all CQ jobs |
| 40 # need a presubmit first and so must be responsive. | 40 # need a presubmit first and so must be responsive. |
| 41 presubmit_builders = ['chromium_presubmit', 'blink_presubmit'] | 41 presubmit_builders = ['chromium_presubmit', 'blink_presubmit'] |
| 42 | 42 |
| 43 # Configurations on every VM. | 43 # Configurations on every VM. |
| 44 base = presubmit_builders + [ | 44 base = presubmit_builders + [ |
| 45 # One line per shared directory. In decreasing usage: | 45 # One line per shared directory. In decreasing usage: |
| 46 'linux_chromium_dbg', 'linux_chromium_rel', | 46 'linux_chromium_dbg', 'linux_chromium_rel', |
| 47 'linux_chromium_dbg_ng', 'linux_chromium_rel_ng', | 47 'linux_chromium_dbg_ng', 'linux_chromium_rel_ng', |
| 48 'linux_chromium_compile_dbg', 'linux_chromium_compile_rel', | 48 'linux_chromium_compile_dbg', 'linux_chromium_compile_rel', |
| 49 'linux_rel_naclmore', | |
| 50 'linux_arm_compile', | 49 'linux_arm_compile', |
| 51 | 50 |
| 52 'linux_chromium_gn_dbg', 'linux_chromium_gn_rel', | 51 'linux_chromium_gn_dbg', 'linux_chromium_gn_rel', |
| 53 'linux_chromium_gn_chromeos_rel', 'linux_chromium_gn_chromeos_dbg', | 52 'linux_chromium_gn_chromeos_rel', 'linux_chromium_gn_chromeos_dbg', |
| 54 'android_chromium_gn_compile_dbg', | 53 'android_chromium_gn_compile_dbg', |
| 55 'android_chromium_gn_compile_dbg_recipe', | 54 'android_chromium_gn_compile_dbg_recipe', |
| 56 'android_chromium_gn_compile_rel', | 55 'android_chromium_gn_compile_rel', |
| 57 'android_chromium_gn_compile_rel_recipe', | 56 'android_chromium_gn_compile_rel_recipe', |
| 58 | 57 |
| 59 'linux_chromium_chromeos_dbg', 'linux_chromium_chromeos_rel', | 58 'linux_chromium_chromeos_dbg', 'linux_chromium_chromeos_rel', |
| 60 'linux_chromium_chromeos_rel_ng', | 59 'linux_chromium_chromeos_rel_ng', |
| 61 'linux_chromium_chromeos_compile_dbg_ng', | 60 'linux_chromium_chromeos_compile_dbg_ng', |
| 62 'linux_chromium_chromeos_compile_rel_ng', | 61 'linux_chromium_chromeos_compile_rel_ng', |
| 63 'linux_nacl_sdk_build', | 62 'linux_nacl_sdk_build', |
| 64 'linux_nacl_sdk_bionic_build', | 63 'linux_nacl_sdk_bionic_build', |
| 65 | 64 |
| 66 'infra_tester', | 65 'infra_tester', |
| 67 | 66 |
| 68 'tools_build_presubmit', | 67 'tools_build_presubmit', |
| 69 ] | 68 ] |
| 70 | 69 |
| 71 # One of the extra configuration per VM. | 70 # One of the extra configuration per VM. |
| 72 # First the ones barely used. By reducing the number of available slaves, we | 71 # First the ones barely used. By reducing the number of available slaves, we |
| 73 # increase the "cache locally" of having a checkout already recent on the | 72 # increase the "cache locally" of having a checkout already recent on the |
| 74 # slave. | 73 # slave. |
| 75 extras = [ | 74 extras = [ |
| 76 [['linux_chromeos_valgrind'], 2], | |
| 77 [['linux_valgrind'], 4], | |
| 78 [['linux_chromeos_asan', 'linux_chromeos_browser_asan'], 6], | 75 [['linux_chromeos_asan', 'linux_chromeos_browser_asan'], 6], |
| 79 [['linux_redux'], 2], | |
| 80 [['linux_nacl_sdk', 'linux_nacl_sdk_bionic'], 3], | 76 [['linux_nacl_sdk', 'linux_nacl_sdk_bionic'], 3], |
| 81 [['linux_ecs_ozone'], 3], | 77 [['linux_ecs_ozone'], 3], |
| 82 [['linux_arm'], 3], | 78 [['linux_arm'], 3], |
| 83 # These ones below are significantly used ones. They use all the remaining | 79 # These ones below are significantly used ones. They use all the remaining |
| 84 # slaves. | 80 # slaves. |
| 85 [['linux_chromium_chromeos_athena_rel_ng'], -1], | 81 [['linux_chromium_chromeos_athena_rel_ng'], -1], |
| 86 [['linux_chromium_chromeos_ozone_rel', | 82 [['linux_chromium_chromeos_ozone_rel', |
| 87 'linux_chromium_chromeos_ozone_dbg'], -1], | 83 'linux_chromium_chromeos_ozone_dbg'], -1], |
| 88 [['linux_chromium_asan_rel', 'linux_chromium_asan_rel_ng'], -1], | 84 [['linux_chromium_asan_rel', 'linux_chromium_asan_rel_ng'], -1], |
| 89 [['linux_layout', 'linux_layout_rel'], -1], | 85 [['linux_layout', 'linux_layout_rel'], -1], |
| (...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 291 'version': 'precise', | 287 'version': 'precise', |
| 292 'bits': '64', | 288 'bits': '64', |
| 293 } for i in range(100, 241) | 289 } for i in range(100, 241) |
| 294 ] | 290 ] |
| 295 | 291 |
| 296 return compile_slaves + test_slaves + aosp_slaves + swarm_dumb_slaves1 + \ | 292 return compile_slaves + test_slaves + aosp_slaves + swarm_dumb_slaves1 + \ |
| 297 swarm_dumb_slaves2 | 293 swarm_dumb_slaves2 |
| 298 | 294 |
| 299 | 295 |
| 300 slaves = linux() + android() | 296 slaves = linux() + android() |
| OLD | NEW |