Update src side configuration to reflect LUCI migration of perf builders

Bug: 828472, 828468
Cq-Include-Trybots: master.tryserver.chromium.perf:obbs_fyi
Change-Id: I8028741debe7cada46bd94442076716fe4765e5a
Reviewed-on: https://chromium-review.googlesource.com/c/1260306Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: Ned Nguyen <nednguyen@google.com>
Cr-Commit-Position: refs/heads/master@{#596467}

infra/config/global/luci-milo.cfg

@@ -1238,8 +1238,7 @@ consoles {
     short_name: "a64"
   }
   builders {
-    name: "buildbot/chromium.perf/Win Builder Perf"
-    name: "buildbucket/luci.chrome.ci/Win Builder Perf"
+    name: "buildbucket/luci.chrome.ci/win32-builder-perf"
     category: "builder|win"
     short_name: "32"
   }

testing/buildbot/chromium.perf.json

@@ -335,16 +335,6 @@
       }
     ]
   },
-  "Linux Builder Perf": {
-    "additional_compile_targets": [
-      "chromedriver"
-    ]
-  },
-  "Mac Builder Perf": {
-    "additional_compile_targets": [
-      "chromedriver"
-    ]
-  },
   "Win 7 Nvidia GPU Perf": {
     "isolated_scripts": [
       {
@@ -790,11 +780,6 @@
       }
     ]
   },
-  "Win Builder Perf": {
-    "additional_compile_targets": [
-      "chromedriver"
-    ]
-  },
   "android-builder-perf": {
     "additional_compile_targets": [
       "microdump_stackwalk",
@@ -1134,6 +1119,11 @@
       "angle_perftests"
     ]
   },
+  "linux-builder-perf": {
+    "additional_compile_targets": [
+      "chromedriver"
+    ]
+  },
   "linux-perf": {
     "isolated_scripts": [
       {
@@ -1668,6 +1658,11 @@
       }
     ]
   },
+  "mac-builder-perf": {
+    "additional_compile_targets": [
+      "chromedriver"
+    ]
+  },
   "win-10-perf": {
     "isolated_scripts": [
       {
@@ -1846,6 +1841,11 @@
       }
     ]
   },
+  "win32-builder-perf": {
+    "additional_compile_targets": [
+      "chromedriver"
+    ]
+  },
   "win64-builder-perf": {
     "additional_compile_targets": [
       "chromedriver"

tools/mb/mb_config.pyl

@@ -386,11 +386,7 @@
       'android_arm64-builder-perf': 'official_goma_minimal_symbols_android_arm64',
       'android-builder-perf': 'official_goma_minimal_symbols_android',
       'linux-builder-perf': 'official_goma_perf',
-      # TODO(crbug.com/828468): Remove 'Mac Builder Perf'
-      'Mac Builder Perf': 'official_goma',
       'mac-builder-perf': 'official_goma',
-      # TODO(crbug.com/828472): Remove 'Win Builder Perf'
-      'Win Builder Perf': 'official_goma_x86',
       'win32-builder-perf': 'official_goma_x86',
       'win64-builder-perf': 'official_goma',
     },

tools/perf/core/perf_data_generator.py

@@ -44,9 +44,9 @@ from py_utils import discover
 BUILDER_ADDITIONAL_COMPILE_TARGETS = {
     'android-builder-perf': ['microdump_stackwalk', 'angle_perftests'],
     'android_arm64-builder-perf': ['microdump_stackwalk', 'angle_perftests'],
-    'Linux Builder Perf': ['chromedriver'],
-    'Mac Builder Perf': ['chromedriver'],
-    'Win Builder Perf': ['chromedriver'],
+    'linux-builder-perf': ['chromedriver'],
+    'mac-builder-perf': ['chromedriver'],
+    'win32-builder-perf': ['chromedriver'],
     'win64-builder-perf': ['chromedriver'],
 }