Sync up mb_config.pyl w/ buildbot masters.

tools/mb/mb_config.pyl

 # Copyright 2015 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.
 
 {
   # This is a map of buildbot master names -> buildbot builder names ->
   # config names (where each config name is a key in the 'configs' dict,
   # below). MB uses this dict to look up which config to use for a given bot.
   'masters': {
     # Take care when changing any of these builders to ensure that you do not
@@ skipping 297 matching lines @@
       'Linux Builder (dbg)': 'swarming_gn_debug_bot',
       'Linux Builder (dbg)(32)': 'swarming_gn_debug_bot_x86',
       'Linux Builder': 'swarming_gn_release_bot',
       'Linux Tests (dbg)(1)': 'none',
       'Linux Tests (dbg)(1)(32)': 'none',
       'Linux Tests': 'none',
     },
 
     'chromium.lkgr': {
       'ASAN Debug': 'gn_asan_lsan_edge_debug_bot',
-      'ASAN Release (symbolized)':
-        'gn_asan_lsan_edge_fuzzer_v8_heap_symbolized_release_bot',
       'ASAN Release Media':
         'gn_asan_lsan_edge_fuzzer_v8_heap_chromeos_codecs_release_bot',
       'ASAN Release': 'gn_asan_lsan_edge_fuzzer_v8_heap_release_bot',
       'ASan Debug (32-bit x86 with V8-ARM)':
         'gn_asan_edge_v8_heap_debug_bot_hybrid',
       'ASan Release (32-bit x86 with V8-ARM)':
         'gn_asan_edge_fuzzer_v8_heap_release_bot_hybrid',
-      'ASan Release (32-bit x86 with V8-ARM, symbolized)':
-        'gn_asan_edge_fuzzer_v8_heap_symbolized_release_bot_hybrid',
       'ASan Release Media (32-bit x86 with V8-ARM)':
         'gn_asan_edge_fuzzer_v8_heap_chromeos_codecs_release_bot_hybrid',
       'ChromiumOS ASAN Release':
         'gn_chromeos_asan_lsan_edge_fuzzer_v8_heap_release_bot',
       'MSAN Release (chained origins)': 'gn_msan_edge_release_bot',
       'MSAN Release (no origins)': 'gn_msan_no_origins_edge_release_bot',
       'Mac ASAN Debug': 'gyp_asan_fuzzer_v8_heap_debug_symbols_static_bot',
       'Mac ASAN Release Media':
         'gyp_asan_fuzzer_v8_heap_chrome_with_codecs_release_bot',
       'Mac ASAN Release': 'gyp_asan_fuzzer_v8_heap_release_bot',
@@ skipping 21 matching lines @@
       'Mac10.9 Tests': 'none',
       'ios-device': 'ios_gyp',
       'ios-device-gn': 'ios_gn',
       'ios-simulator': 'ios_gyp',
       'ios-simulator-gn': 'ios_gn',
     },
 
     'chromium.memory': {
       'Linux ASan LSan Builder': 'swarming_asan_lsan_gn_release_bot',
       'Linux ASan LSan Tests (1)': 'none',
-      'Linux ASan LSan Tests (sandboxed)': 'none',
+      'Linux ASan Tests (sandboxed)': 'none',
       'Mac ASan 64 Builder': 'swarming_asan_lsan_full_symbols_gyp_release_bot',
       'Mac ASan 64 Tests (1)': 'none',
       'Linux Chromium OS ASan LSan Builder':
         'swarming_asan_lsan_chromeos_gyp_release_bot',
       'Linux Chromium OS ASan LSan Tests (1)': 'none',
     },
 
     'chromium.memory.fyi': {
       'Chromium Linux ChromeOS MSan Builder':
         'swarming_gyp_chromeos_msan_release_bot',
@@ skipping 312 matching lines @@
       # shared library loading is fixed.
       'android_cronet_tester': 'android_cronet_gn_debug_static_bot',
       'android_n5x_swarming_rel': 'swarming_android_gn_release_trybot_arm64',
       'android_swarming_rel': 'swarming_android_gn_release_trybot',
       'cast_shell_android': 'android_cast_gn_debug_static_bot',
       'linux_android_dbg_ng': 'swarming_android_gn_debug_trybot',
       'linux_android_rel_ng': 'swarming_android_gn_release_trybot',
     },
 
     'tryserver.chromium.angle': {
+      'android_angle_rel_ng':
+        'swarming_gpu_fyi_tests_android_gn_release_trybot',
       'linux_angle_chromeos_rel_ng':
         'swarming_gpu_fyi_tests_chromeos_gyp_release_trybot',
       'linux_angle_dbg_ng': 'swarming_gpu_fyi_tests_gn_debug_trybot',
       'linux_angle_rel_ng': 'swarming_gpu_fyi_tests_gn_release_trybot',
       'mac_angle_dbg_ng': 'swarming_gpu_fyi_tests_gyp_debug_trybot',
       'mac_angle_rel_ng': 'swarming_gpu_fyi_tests_gyp_release_trybot',
       'win_angle_dbg_ng': 'swarming_gpu_tests_deqp_gles_gyp_debug_trybot_x86',
       'win_angle_rel_ng': 'swarming_gpu_tests_deqp_gles_gyp_release_trybot_x86',
       'win_angle_x64_dbg_ng':
         'swarming_gpu_tests_deqp_gles_gyp_debug_trybot_x64',
@@ skipping 12 matching lines @@
       'chromeos_daisy_chromium_compile_only_ng': 'cros_chrome_sdk_gn',
       'chromeos_daisy_variable': 'findit',
       'chromeos_x86-generic_chromium_compile_only_ng': 'cros_chrome_sdk_gn',
       'chromeos_x86-generic_variable': 'findit',
       'chromium_presubmit': 'none',
       'closure_compilation': 'closure_compilation',
       'linux_arm': 'swarming_gn_release_trybot_arm',
       'linux_chromium_archive_rel_ng': 'noswarming_gn_release_bot',
       'linux_chromium_asan_rel_ng': 'swarming_asan_lsan_gn_release_trybot',
       'linux_chromium_asan_variable': 'findit',
+      'linux_chromium_blimp_variable': 'findit',

[Nico, 2016/06/21 18:39:29]

i don't know what the _variable bots do. i thought 'findit' is some java static
analysis thing, so this line looks wrong from a distance.

[Dirk Pranke, 2016/06/21 21:42:10]

Findit in this case is the system the QA team runs to auto-bisect and find
regressions.

The "variable" builders mirror continuous builders and bisect things, hence what
they run is "variable".

       'linux_chromium_browser_side_navigation_rel': 'gn_release_trybot',
       'linux_chromium_cast_variable': 'findit',
       'linux_chromium_cfi_rel_ng': 'gn_cfi_release_static_dcheck_always_on',
       'linux_chromium_chromeos_asan_rel_ng':
         'swarming_asan_lsan_chromeos_gyp_release_trybot',
       'linux_chromium_chromeos_asan_variable': 'findit',
       'linux_chromium_chromeos_compile_dbg_ng':
         'swarming_chromeos_gn_debug_trybot',
       'linux_chromium_chromeos_compile_rel_ng':
         'swarming_chromeos_gn_release_trybot',
@@ skipping 56 matching lines @@
       'mac_chromium_asan_variable': 'findit',
       'mac_chromium_compile_dbg_ng': 'swarming_gyp_debug_trybot',
       'mac_chromium_compile_rel_ng': 'swarming_gpu_tests_gyp_release_trybot',
       'mac_chromium_dbg_ng': 'swarming_gyp_debug_trybot',
       'mac_chromium_gn_dbg': 'gn_debug_bot',
       'mac_chromium_gn_rel': 'gn_release_trybot',
       'mac_chromium_gn_upload': 'gn_release_bot',
       'mac_chromium_rel_ng': 'swarming_gpu_tests_gyp_release_trybot',
       'mac_chromium_variable': 'findit',
       'mac_chromium_variable_10.10': 'findit',
-      'mac_chromium_variable_10.10_macviews': 'findit',
       'mac_chromium_variable_10.10_layout': 'findit',
       'mac_chromium_variable_10.11': 'findit',
       'mac_chromium_variable_10.11_layout': 'findit',
       'mac_chromium_variable_archive': 'findit',
       'mac_chromium_variable_chrome': 'findit',
       'mac_chromium_variable_gn': 'findit',
       'mac_chromium_variable_layout': 'findit',
       'mac_nacl_sdk': 'gyp_release_bot',
       'mac_nacl_sdk_build': 'gyp_release_bot',
       'mac_optional_gpu_tests_rel':
@@ skipping 28 matching lines @@
       'mac_fyi_perf_bisect': 'gyp_official_goma',
       'mac_hdd_perf_bisect': 'gyp_official_goma',
       'mac_perf_bisect_builder': 'gyp_official_goma',
       'mac_retina_perf_bisect': 'gyp_official_goma',
       'mac_retina_perf_cq': 'gyp_official_goma',
       'win_8_perf_bisect': 'gn_official_goma_minimal_symbols_x86',
       'win_fyi_perf_bisect': 'gn_official_goma_minimal_symbols_x86',
       'win_perf_bisect': 'gn_official_goma_minimal_symbols_x86',
       'win_perf_bisect_builder': 'gn_official_goma_minimal_symbols_x86',
       'win_x64_perf_bisect': 'gn_official_goma_minimal_symbols_x64',
-      'winx64_8_perf_bisect': 'gn_official_goma_minimal_symbols_x64',
       'winx64_10_perf_bisect': 'gn_official_goma_minimal_symbols_x64',
       'winx64_10_perf_cq': 'gn_official_goma_minimal_symbols_x64',
       'winx64_bisect_builder': 'gn_official_goma_minimal_symbols_x64',
-      'winx64_fyi_perf_bisect': 'gn_official_goma_minimal_symbols_x64',
       'winx64_zen_perf_bisect': 'gn_official_goma_minimal_symbols_x64',
       'winx64ati_perf_bisect': 'gn_official_goma_minimal_symbols_x64',
       'winx64intel_perf_bisect': 'gn_official_goma_minimal_symbols_x64',
       'winx64nvidia_perf_bisect': 'gn_official_goma_minimal_symbols_x64',
     },
 
     'tryserver.chromium.win': {
       'win10_chromium_x64_rel_ng': 'swarming_gn_release_trybot_x64',
       'win10_chromium_x64_rel_ng_exp': 'swarming_gn_release_trybot_x64',
       'win8_chromium_gn_dbg': 'swarming_gn_debug_trybot_x86',
@@ skipping 357 matching lines @@
     ],
 
     'gn_asan_edge_fuzzer_v8_heap_release_bot_hybrid': [
       'gn', 'asan', 'edge', 'fuzzer', 'v8_heap', 'release_bot', 'hybrid',
     ],
 
     'gyp_asan_edge_fuzzer_v8_heap_release_bot_x86': [
       'gyp', 'asan', 'edge', 'fuzzer', 'v8_heap', 'release_bot', 'x86',
     ],
 
-    'gn_asan_edge_fuzzer_v8_heap_symbolized_release_bot_hybrid': [
-      'gn', 'asan', 'edge', 'fuzzer', 'v8_heap', 'symbolized',
-      'release_bot', 'hybrid',
-    ],
-
     'gyp_asan_fuzzer_v8_heap_chrome_with_codecs_release_bot': [
       'gyp', 'asan', 'fuzzer', 'v8_heap', 'chrome_with_codecs', 'release_bot',
     ],
 
     'gyp_asan_fuzzer_v8_heap_chrome_with_codecs_release_bot_x86': [
       'gyp', 'asan', 'fuzzer', 'v8_heap', 'chrome_with_codecs',
       'release_bot', 'x86',
     ],
 
     'gyp_asan_fuzzer_v8_heap_debug_symbols_static_bot': [
@@ skipping 353 matching lines @@
     ],
 
     'swarming_gn_release_trybot': [
       'swarming', 'gn', 'release_bot',
     ],
 
     'swarming_gn_release_trybot_x64': [
       'swarming', 'gn', 'release_trybot', 'x64',
     ],
 
+    'swarming_gpu_fyi_tests_android_gn_release_trybot': [
+      'swarming', 'gpu_tests', 'internal_gles2_conform_tests', 'gn',

[Nico, 2016/06/21 18:39:29]

jmadill / kbr: Does this bot look right?

[Ken Russell (switch to Gerrit), 2016/06/21 18:54:13]

Actually, I'm not sure it is -- not sure this should be specifying
angle_deqp_tests, at least not yet. +ynovikov

[Jamie Madill, 2016/06/21 19:24:30]

I doubt the deqp tests compile at this time, so probably should be left out.
Also same goes for gles2_conform_test, I don't see that config being enabled
currently for the android bot I checked.

+      'android', 'release_trybot', 'angle_deqp_tests',
+    ],
+
     'swarming_gpu_fyi_tests_chromeos_gyp_release_trybot': [
       'swarming', 'gpu_tests', 'internal_gles2_conform_tests', 'gyp',
       'release_trybot', 'angle_deqp_tests', 'chromeos',
     ],
 
     'swarming_gpu_fyi_tests_gn_debug_trybot': [
       'swarming', 'gpu_tests', 'internal_gles2_conform_tests', 'gn',
       'debug_trybot', 'angle_deqp_tests',
     ],
 
@@ skipping 688 matching lines @@
     },
 
     'drfuzz': { 'gn_args': 'use_drfuzz=true' },
 
     'drmemory': {
       'gn_args': 'is_component_build=true enable_iterator_debugging=false',
       'gyp_defines': 'component=shared_library build_for_tool=drmemory',
     },
   },
 }