[infra] Clean up after main builder-tester separation

Bug: chromium:1136844
Change-Id: Idef9b5a9f1f8499ff5c52b3ec0d54795fec60b28
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3284893
Auto-Submit: Almothana Athamneh <almuthanna@chromium.org>
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/main@{#77931}

infra/mb/mb_config.pyl

@@ -71,10 +71,10 @@
       'V8 Linux64 - external code space - debug - builder': 'debug_x64_external_code_space',
       'V8 Linux64 - custom snapshot - debug builder': 'debug_x64_custom',
       'V8 Linux64 - heap sandbox - debug - builder': 'debug_x64_heap_sandbox',
-      'V8 Linux64 - internal snapshot': 'release_x64_internal',
-      'V8 Linux64 - debug - header includes': 'debug_x64_header_includes',
-      'V8 Linux64 - shared': 'release_x64_shared_verify_heap',
-      'V8 Linux64 - verify csa': 'release_x64_verify_csa',
+      'V8 Linux64 - internal snapshot - builder': 'release_x64_internal',
+      'V8 Linux64 - debug - header includes - builder': 'debug_x64_header_includes',
+      'V8 Linux64 - shared - builder': 'release_x64_shared_verify_heap',
+      'V8 Linux64 - verify csa - builder': 'release_x64_verify_csa',
       'V8 Linux64 - no wasm - builder': 'release_x64_webassembly_disabled',
       # Windows.
       'V8 Win32 - builder': 'release_x86_minimal_symbols',
@@ -83,27 +83,27 @@
       'V8 Win32 - builder (reclient compare)': 'release_x86_minimal_symbols_reclient',
       'V8 Win32 - debug builder': 'debug_x86_minimal_symbols',
       # TODO(machenbach): Remove after switching to x64 on infra side.
-      'V8 Win64 ASAN': 'release_x64_asan_no_lsan',
-      'V8 Win64': 'release_x64_minimal_symbols',
+      'V8 Win64 ASAN - builder': 'release_x64_asan_no_lsan',
+      'V8 Win64 - builder': 'release_x64_minimal_symbols',
       'V8 Win64 - dev image': 'release_x64_minimal_symbols',
-      'V8 Win64 - debug': 'debug_x64_minimal_symbols',
-      'V8 Win64 - msvc': 'release_x64_msvc',
+      'V8 Win64 - debug builder': 'debug_x64_minimal_symbols',
+      'V8 Win64 - msvc - builder': 'release_x64_msvc',
       # Mac.
       'V8 Mac64 - builder': 'release_x64',
       'V8 Mac64 - debug builder': 'debug_x64',
       'V8 Official Mac ARM64': 'release_arm64',
       'V8 Official Mac ARM64 Debug': 'debug_arm64',
-      'V8 Mac64 ASAN': 'release_x64_asan_no_lsan',
+      'V8 Mac64 ASAN - builder': 'release_x64_asan_no_lsan',
       'V8 Mac - arm64 - release builder': 'release_arm64',
       'V8 Mac - arm64 - debug builder': 'debug_arm64',
       'V8 Mac - arm64 - sim - debug builder': 'debug_simulate_arm64',
       'V8 Mac - arm64 - sim - release builder': 'release_simulate_arm64',
       # Sanitizers.
-      'V8 Linux64 ASAN': 'release_x64_asan',
+      'V8 Linux64 ASAN - builder': 'release_x64_asan',
       'V8 Linux64 TSAN - builder': 'release_x64_tsan',
       'V8 Linux64 TSAN - no-concurrent-marking - builder': 'release_x64_tsan_no_cm',
-      'V8 Linux - arm64 - sim - CFI': 'release_simulate_arm64_cfi',
-      'V8 Linux - arm64 - sim - MSAN': 'release_simulate_arm64_msan',
+      'V8 Linux - arm64 - sim - CFI - builder': 'release_simulate_arm64_cfi',
+      'V8 Linux - arm64 - sim - MSAN - builder': 'release_simulate_arm64_msan',
       # Misc.
       'V8 Linux gcc': 'release_x86_gcc',
       # FYI.
@@ -113,7 +113,7 @@
       'V8 Linux64 - debug - perfetto - builder': 'debug_x64_perfetto',
       'V8 Linux64 - disable runtime call stats': 'release_x64_disable_runtime_call_stats',
       'V8 Linux64 - debug - single generation - builder': 'debug_x64_single_generation',
-      'V8 Linux64 - pointer compression': 'release_x64_pointer_compression',
+      'V8 Linux64 - pointer compression - builder': 'release_x64_pointer_compression',
       'V8 Linux64 - pointer compression without dchecks':
           'release_x64_pointer_compression_without_dchecks',
       'V8 Linux64 - arm64 - sim - pointer compression - builder':
@@ -121,8 +121,8 @@
       'V8 Linux64 gcc - debug': 'debug_x64_gcc',
       'V8 Fuchsia - builder': 'release_x64_fuchsia',
       'V8 Fuchsia - debug builder': 'debug_x64_fuchsia',
-      'V8 Linux64 - cfi': 'release_x64_cfi',
-      'V8 Linux64 UBSan': 'release_x64_ubsan',
+      'V8 Linux64 - cfi - builder': 'release_x64_cfi',
+      'V8 Linux64 UBSan - builder': 'release_x64_ubsan',
       'V8 Linux - vtunejit': 'debug_x86_vtunejit',
       'V8 Linux64 - gcov coverage': 'release_x64_gcc_coverage',
       'V8 Linux64 - Fuzzilli': 'release_x64_fuzzilli',