Make nacl_sdk_build slaves run on all 'normal' bots.

masters/master.tryserver.chromium/slaves.cfg

 # -*- python -*-
 # ex: set syntax=python:
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # See master.experimental/slaves.cfg for documentation.
 
 
 def expand_extra_builders(extras, total):
@@ skipping 30 matching lines @@
 
   # Have a dedicated pool for presubmit jobs - all CQ jobs
   # need a presubmit first and so must be responsive.
   presubmit_builders = ['chromium_presubmit', 'blink_presubmit']
 
   # Configurations on every VM.
   base = presubmit_builders + [
     # One line per shared directory. In decreasing usage:
     'linux', 'linux_rel', 'linux_rel_naclmore', 'linux_clang',
     'linux_chromeos', 'linux_aura',
+    'linux_nacl_sdk_build',
 
     'blink_bare_presubmit',
 
     'tools_presubmit',
   ]
+
   # One of the extra configuration per VM.
   # First the ones barely used. By reducing the number of available slaves, we
   # increase the "cache locally" of having a checkout already recent on the
   # slave.
   extras = [
     [['linux_chromeos_clang'], 15],
     [['linux_futura'], 15],
     [['linux_blink_git', 'linux_blink_rel_git'], 7],
     [['linux_chromeos_valgrind'], 2],
     [['linux_valgrind', 'linux_tsan'], 4],
     [['linux_chromeos_asan'], 3],
     [['linux_redux'], 2],
     [['linux_heapcheck'], 2],
     [['linux_nacl_sdk'], 3],
-    [['linux_nacl_sdk_build'], 3],
     # These ones below are significantly used ones. They use all the remaining
     # slaves.
     [['linux_asan', 'linux_browser_asan'], -1],
     [['linux_chromium_dbg', 'linux_chromium_rel'], -1],
     [['linux_layout', 'linux_layout_rel',
       'linux_blink', 'linux_blink_rel',], -1],
   ]
 
   extras_expanded = expand_extra_builders(extras, len(all_slaves))
 
@@ skipping 146 matching lines @@
   ])
 
   return result
 
 
 def mac():
   extras = [
     # One line per shared directory:
     [['mac_valgrind'], 6],
     [['mac_nacl_sdk'], 6],
-    [['mac_nacl_sdk_build'], 6],
     # These ones below are significantly used ones. They use all the remaining
     # slaves.
     [['mac_chromium_dbg', 'mac_chromium_rel'], -1],
     [['mac_layout', 'mac_layout_rel', 'mac_blink', 'mac_blink_rel',
       'mac_blink_git', 'mac_blink_rel_git'], -1],
   ]
   all_old_slaves = range(600, 655)
   extras_expanded = expand_extra_builders(extras, len(all_old_slaves))
   perf_bisect_slaves = [1, 2]
   out = [
@@ skipping 13 matching lines @@
   out += [
     {
       'master': 'TryServer',
       'builder': [
           # One line per shared directory:
           'mac', 'mac_rel', 'mac_rel_naclmore',
           'mac_layout_alt', 'mac_layout_rel_alt',
           'mac_valgrind_alt',
           'mac_asan',
           'mac_nacl_sdk_alt',
+          'mac_nacl_sdk_build'
       ],
       'hostname': 'vm%d-m4' % i,
       'os': 'mac',
       'version': '10.7',
       'bits': '64',
     } for i in sorted(range(666, 737))
   ]
   out += [
     # 64-bit Mac ASan
     {
@@ skipping 213 matching lines @@
   perf_a4_slaves = [2, 3]
   perf_xp_a4_slaves = [11]
   perf_8_a4_slaves = [12]
 
   normal_slaves = [
     {
       'master': 'TryServer',
       'builder': [
         'win', 'win_rel_naclmore', 'win_rel',
         'win_chromium_dbg', 'win_chromium_rel',
+        'win_nacl_sdk_build'
       ],
       'hostname': 'vm%d-m4' % number,
       'os': 'win',
       'version': 'win7',
       'bits': '64',
     } for number in win7
   ]
   win_x64_slaves = [
     {
       'master': 'TryServer',
       'builder': ['win_x64_rel'],
       'hostname': 'vm%d-m4' % number,
       'os': 'win',
       'version': 'win7',
       'bits': '64',
     } for number in win7_x64
   ]
   nacl_sdk_slaves = [
     {
       'master': 'TryServer',
       'builder': [
-        'win_nacl_sdk', 'win_nacl_sdk_build'
+        'win_nacl_sdk',
       ],
       'hostname': 'vm%d-m4' % number,
       'os': 'win',
       'version': 'win7',
       'bits': '64',
     } for number in range(519, 521)
   ]
   layout_slaves = [
     {
       'master': 'TryServer',
@@ skipping 146 matching lines @@
       chromeframe_slave +
       gpu_slaves +
       swarm_slaves +
       win_tsan_slave +
       win_x64_slaves +
       swarm_dumb_slaves +
       perf_bisect_slaves)
 
 
 slaves = linux() + mac() + windows() + cros() + android() + ios()