Rename main chromium builders

Uses the bit.ly/chromium-build-naming naming scheme.

Re-land which shouldn't break builders. Depends on https://crrev.com/c/1155263

Bug: 867725
Change-Id: I230121d1e531de5aeaeb34f09e2b1b6432008eff
Reviewed-on: https://chromium-review.googlesource.com/1153616Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Commit-Queue: Stephen Martinis <martiniss@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#578829}
Reviewed-on: https://chromium-review.googlesource.com/1155751Reviewed-by: Nodir Turakulov <nodir@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#579572}

infra/config/global/cr-buildbucket.cfg

@@ -1646,7 +1646,7 @@ buckets {
       mixins: "lkgr-ci"
     }
     builders {
-      name: "Win x64"
+      name: "win-rel"
       dimensions: "os:Windows-10"
       dimensions: "cores:32"
       mixins: "chromium-ci"
@@ -1673,7 +1673,7 @@ buckets {
       mixins: "android-ci"
     }
     builders {
-      name: "Android"
+      name: "android-rel"
       dimensions: "os:Ubuntu-14.04"
       dimensions: "cores:32"
       mixins: "chromium-ci"
@@ -1919,7 +1919,7 @@ buckets {
       mixins: "android-fyi-ci"
     }
     builders {
-      name: "Linux x64"
+      name: "linux-rel"
       dimensions: "os:Ubuntu-14.04"
       dimensions: "cores:32"
       mixins: "chromium-ci"
@@ -2050,7 +2050,7 @@ buckets {
       mixins: "android-ci"
     }
     builders {
-      name: "Mac"
+      name: "mac-rel"
       dimensions: "os:Mac-10.13"
       mixins: "chromium-ci"
     }
@@ -2143,7 +2143,7 @@ buckets {
       mixins: "swarm-ci"
     }
     builders {
-      name: "Win"
+      name: "win32-rel"
       dimensions: "os:Windows-10"
       dimensions: "cores:32"
       mixins: "chromium-ci"

infra/config/global/luci-milo.cfg

@@ -314,27 +314,27 @@ consoles {
   refs: "refs/heads/master"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.chromium.ci/Win"
+    name: "buildbucket/luci.chromium.ci/win32-rel"
     category: "chromium|win"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/Win x64"
+    name: "buildbucket/luci.chromium.ci/win-rel"
     category: "chromium|win"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/Mac"
+    name: "buildbucket/luci.chromium.ci/mac-rel"
     category: "chromium"
     short_name: "mac"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/Linux x64"
+    name: "buildbucket/luci.chromium.ci/linux-rel"
     category: "chromium"
     short_name: "lin"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/Android"
+    name: "buildbucket/luci.chromium.ci/android-rel"
     category: "chromium"
     short_name: "and"
   }
@@ -1438,24 +1438,24 @@ consoles {
   manifest_name: "REVISION"
   include_experimental_builds: true
   builders {
-    name: "buildbucket/luci.chromium.ci/Android"
+    name: "buildbucket/luci.chromium.ci/android-rel"
     short_name: "an"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/Linux x64"
+    name: "buildbucket/luci.chromium.ci/linux-rel"
     short_name: "lnx"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/Mac"
+    name: "buildbucket/luci.chromium.ci/mac-rel"
     short_name: "mac"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/Win"
+    name: "buildbucket/luci.chromium.ci/win32-rel"
     category: "win"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/Win x64"
+    name: "buildbucket/luci.chromium.ci/win-rel"
     category: "win"
     short_name: "64"
   }

infra/config/global/luci-scheduler.cfg

@@ -85,7 +85,7 @@ trigger {
   triggers: "Android arm64 Builder (dbg)"
   triggers: "Android x64 Builder (dbg)"
   triggers: "Android x86 Builder (dbg)"
-  triggers: "Android"
+  triggers: "android-rel"
   triggers: "Cast Android (dbg)"
   triggers: "Cast Audio Linux"
   triggers: "Cast Linux"
@@ -161,7 +161,7 @@ trigger {
   triggers: "Linux remote_run Builder"
   triggers: "Linux x64 Goma Canary (clobber)"
   triggers: "Linux x64 Goma Canary LocalOutputCache"
-  triggers: "Linux x64"
+  triggers: "linux-rel"
   triggers: "MSAN Release (chained origins)"
   triggers: "MSAN Release (no origins)"
   triggers: "Mac ASAN Debug"
@@ -179,7 +179,7 @@ trigger {
   triggers: "Mac Swarm"
   triggers: "Mac deterministic (dbg)"
   triggers: "Mac deterministic"
-  triggers: "Mac"
+  triggers: "mac-rel"
   triggers: "Mojo Android"
   triggers: "Mojo ChromiumOS"
   triggers: "Mojo Linux"
@@ -203,8 +203,8 @@ trigger {
   triggers: "Win cl.exe Goma Canary LocalOutputCache"
   triggers: "Win x64 Builder (dbg)"
   triggers: "Win x64 Builder"
-  triggers: "Win x64"
-  triggers: "Win"
+  triggers: "win-rel"
+  triggers: "win32-rel"
   triggers: "Win7 Builder (dbg) Goma Canary"
   triggers: "Win7 Builder Goma Canary"
   triggers: "WinMSVC64 Goma Canary"
@@ -2268,12 +2268,12 @@ job {
 }
 
 job {
-  id: "Android"
+  id: "android-rel"
   acl_sets: "default"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "Android"
+    builder: "android-rel"
   }
 }
 
@@ -2825,12 +2825,12 @@ job {
 }
 
 job {
-  id: "Linux x64"
+  id: "linux-rel"
   acl_sets: "default"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "Linux x64"
+    builder: "linux-rel"
   }
 }
 
@@ -2881,12 +2881,12 @@ job {
 }
 
 job {
-  id: "Mac"
+  id: "mac-rel"
   acl_sets: "default"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "Mac"
+    builder: "mac-rel"
   }
 }
 
@@ -3298,12 +3298,12 @@ job {
 }
 
 job {
-  id: "Win"
+  id: "win32-rel"
   acl_sets: "default"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "Win"
+    builder: "win32-rel"
   }
 }
 
@@ -3384,12 +3384,12 @@ job {
 }
 
 job {
-  id: "Win x64"
+  id: "win-rel"
   acl_sets: "default"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "Win x64"
+    builder: "win-rel"
   }
 }
 

testing/buildbot/generate_buildbot_json.py

@@ -749,11 +749,11 @@ class BBJSONGenerator(object):
       'WebKit Linux root_layer_scrolls Dummy Builder',
       'WebKit Linux slimming_paint_v2 Dummy Builder',
       #chromium
-      'android-rel',
-      'linux-rel',
-      'mac-rel',
-      'win32-rel',
-      'win-rel',
+      'Android',
+      'Linux x64',
+      'Mac',
+      'Win',
+      'Win x64',
     ]
 
   def check_input_file_consistency(self):
@@ -822,6 +822,8 @@ class BBJSONGenerator(object):
       for removal in removals:
         if removal not in all_bots:
           missing_bots.add(removal)
+
+    missing_bots = missing_bots - set(bots_that_dont_exist)
     if missing_bots:
       raise BBGenErr('The following nonexistent machines were referenced in '
                      'the test suite exceptions: ' + str(missing_bots))