tryserver.chromium.linux: move linux_asan_rel_ng back to CQ pool

masters/master.tryserver.chromium.linux/slaves.cfg

 # -*- python -*-
 # ex: set syntax=python:
 # Copyright 2014 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 linux():
   chromeos_boards = ('x86-generic', 'amd64-generic', 'daisy')
   cq_slaves = (range(111, 131) + range(162, 399) + range(427, 453) +
                range(493, 497) + range(506, 540) + range(590, 600) +
                range(621, 651) + range(779, 799) + range(800, 837) +
                range(841, 864) + range(878, 897) + range(909, 915) +
                range(1010, 1029))
   cq_builders = [
     'blimp_linux_dbg',
     'cast_shell_linux',
     'chromium_devtools',
     'chromium_presubmit',
     'linux_chromium_archive_rel_ng',
-    'linux_chromium_ubsan_rel_ng',
+    'linux_chromium_asan_rel_ng',
     'linux_chromium_chromeos_asan_rel_ng',
     'linux_chromium_chromeos_compile_dbg_ng',
     'linux_chromium_chromeos_ozone_rel_ng',
     'linux_chromium_chromeos_rel_ng',
     'linux_chromium_clobber_rel_ng',
     'linux_chromium_compile_dbg_ng',
     'linux_chromium_gn_chromeos_dbg',
     'linux_chromium_gn_chromeos_rel',
     'linux_chromium_rel_ng',
   ]
@@ skipping 22 matching lines @@
     'ChromiumOS Codesearch Builder',         # ChromiumOS_Codesearch_Builder
     'closure_compilation',                    # linux
     'linux_chromium_chromeos_compile_rel_ng', # linux_chromeos
     'linux_chromium_chromeos_dbg_ng',         # linux_chromeos
     'linux_chromium_chromeos_variable',       # linux_chromeos
     'linux_chromium_compile_dbg_32_ng',       # linux
     'linux_chromium_compile_rel_ng',          # linux
     'linux_chromium_dbg_ng',                  # linux
     'linux_chromium_dbg_32_ng',               # linux
     'linux_chromium_msan_rel_ng',             # linux_msan
-    'linux_chromium_asan_rel_ng',             # linux ubsan
+    'linux_chromium_ubsan_rel_ng',            # linux ubsan
     'linux_chromiumos_full_variable',         # linux_chromeos
     'linux_chromium_ozone_compile_only_ng',   # linux
     'linux_site_isolation',                   # linux
     'linux_chromium_browser_side_navigation_rel', # linux
   ]
   # Contains all the optional builders with smaller slavebuilddir not
   # covered by optional_builders1.
   optional_builders2 = [
     'chromeos_%s_variable' % (board,)        # chromeos_<board>
     for board in chromeos_boards
@@ skipping 112 matching lines @@
       'bits': 64,
       'builder': ['linux_chromium_headless_rel'],
       'hostname': 'slave%d-c4' % slave,
       'pool': 'linux_chromium_headless_rel',
     })
 
   return result
 
 
 slaves = linux()