Don't do official builds on the MSVC release bots

These bots are timing out near the end of the build. Our theory is that
LTCG is slowing down the link steps. There are probably other official
MSVC builders out there, but we are probably the only ones seeing these
timeouts because we configure out bots to build *all* test targets, not
just chromium_builder_tests or chrome.

While I'm here, completely rewrite the configs used by the MSVC bots on
the clang waterfall. This has the side effect of enabling DCHECKs on the
32-bit shared+release bot to make it consistent with the 64-bit bot. I
don't think the inconsistency was intentional.

R=dpranke@chromium.org, hans@chromium.org

Change-Id: Ia54a297714f4217e9614616ac2c2dafd8fbdfc5e
Reviewed-on: https://chromium-review.googlesource.com/794311
Commit-Queue: Reid Kleckner <rnk@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Reviewed-by: Hans Wennborg <hans@chromium.org>
Cr-Commit-Position: refs/heads/master@{#519809}

tools/mb/mb_config.pyl

@@ -115,15 +115,15 @@
       'CrWinAsan(dll)': 'asan_clang_shared_v8_heap_x86_full_symbols_release',
       'CrWinAsanCov': 'asan_clang_edge_fuzzer_static_v8_heap_x86_full_symbols_release',
 
-      # If CrWinClang is modified, please update CrWinClangGoma on chromium.fyi
-      # in the same way.
-      'CrWinClang': 'clang_official_release_bot_minimal_symbols_x86',
-
-      'CrWinClang(dbg)': 'clang_debug_bot_minimal_symbols_x86',
-      'CrWinClang(shared)': 'clang_minimal_symbols_shared_release_bot_x86_dcheck',
-      'CrWinClang64': 'clang_official_release_bot_minimal_symbols',
-      'CrWinClang64(dbg)': 'win_clang_debug_bot',
-      'CrWinClang64(dll)': 'clang_shared_release_bot_dcheck',
+      # TODO(crbug.com/751220): These are MSVC bots. Rename the buildbots at
+      # some point.
+      'CrWinClang': 'win_msvc_release_bot_x86',
+      'CrWinClang(dbg)': 'win_msvc_debug_bot_x86',
+      'CrWinClang(shared)': 'win_msvc_shared_release_bot_x86',
+      'CrWinClang64': 'win_msvc_release_bot',
+      'CrWinClang64(dbg)': 'win_msvc_debug_bot',
+      'CrWinClang64(dll)': 'win_msvc_shared_release_bot',
+
       'CrWinClangLLD': 'clang_tot_official_static_use_lld_x86',
       'CrWinClangLLD64': 'clang_tot_shared_release_use_lld_dcheck',
       'CrWinClngLLD64dbg': 'clang_tot_full_symbols_shared_debug_use_lld',
@@ -1124,38 +1124,10 @@
       'clang', 'debug_trybot', 'x86',
     ],
 
-    'clang_debug_bot_minimal_symbols_x86': [
-      # Now that the default win bots use clang, use a "clang" bot to make sure
-      # things stay compilable with msvc. TODO(thakis): Having a "clang" bot
-      # check that is very confusing, so rename to "msvc", crbug.com/751220
-      'no_clang', 'debug_bot', 'minimal_symbols', 'x86',
-    ],
-
     'clang_release_bot_minimal_symbols_x86': [
       'clang', 'release_bot', 'minimal_symbols', 'x86',
     ],
 
-    'clang_minimal_symbols_shared_release_bot_x86_dcheck': [
-      # Now that the default win bots use clang, use a "clang" bot to make sure
-      # things stay compilable with msvc. TODO(thakis): Having a "clang" bot
-      # check that is very confusing, so rename to "msvc", crbug.com/751220
-      'no_clang', 'minimal_symbols', 'shared_release_bot', 'x86', 'dcheck_always_on',
-    ],
-
-    'clang_official_release_bot_minimal_symbols': [
-      # Now that the default win bots use clang, use a "clang" bot to make sure
-      # things stay compilable with msvc. TODO(thakis): Having a "clang" bot
-      # check that is very confusing, so rename to "msvc", crbug.com/751220
-      'no_clang', 'official', 'release_bot', 'minimal_symbols',
-    ],
-
-    'clang_official_release_bot_minimal_symbols_x86': [
-      # Now that the default win bots use clang, use a "clang" bot to make sure
-      # things stay compilable with msvc. TODO(thakis): Having a "clang" bot
-      # check that is very confusing, so rename to "msvc", crbug.com/751220
-      'no_clang', 'official', 'release_bot', 'minimal_symbols', 'x86',
-    ],
-
     'clang_official_release_bot_minimal_symbols_x86_clang': [
       # force clang enabled for clang_official_release_bot_minimal_symbols_x86
       # for CrWinClangGoma
@@ -1171,13 +1143,6 @@
       'clang', 'official', 'release_trybot', 'x86',
     ],
 
-    'clang_shared_release_bot_dcheck': [
-      # Now that the default win bots use clang, use a "clang" bot to make sure
-      # things stay compilable with msvc. TODO(thakis): Having a "clang" bot
-      # check that is very confusing, so rename to "msvc", crbug.com/751220
-      'no_clang', 'shared_release_bot', 'dcheck_always_on',
-    ],
-
     'clang_tot_asan_lsan_static_release': [
       'clang_tot', 'asan', 'lsan', 'static', 'release',
     ],
@@ -1727,11 +1692,27 @@
     ],
 
     'win_msvc_release_bot': [
-      'no_clang', 'release_bot', 'minimal_symbols',
+      'no_clang', 'minimal_symbols', 'release_bot',
+    ],
+
+    'win_msvc_release_bot_x86': [
+      'no_clang', 'minimal_symbols', 'release_bot', 'x86',
     ],
 
     'win_msvc_debug_bot': [
-      'no_clang', 'debug_bot', 'minimal_symbols',
+      'no_clang', 'minimal_symbols', 'debug_bot',
+    ],
+
+    'win_msvc_debug_bot_x86': [
+      'no_clang', 'minimal_symbols', 'debug_bot', 'x86',
+    ],
+
+    'win_msvc_shared_release_bot': [
+      'no_clang', 'minimal_symbols', 'shared_release_bot', 'dcheck_always_on',
+    ],
+
+    'win_msvc_shared_release_bot_x86': [
+      'no_clang', 'minimal_symbols', 'shared_release_bot', 'dcheck_always_on', 'x86',
     ],
 
     # TODO(tikuta): Remove this once gcp goma backend supports all windows nacl compilers.