Revert "Rename main chromium builders"

This reverts commit eaeee48e.

Reason for revert: broke generate build file step on some builders. See https://logs.chromium.org/logs/chromium/buildbucket/cr-buildbucket.appspot.com/8939809310924674512/+/steps/generate_build_files/0/stdout as an example:

Traceback (most recent call last):
  File "C:\b\swarming\w\ir\cache\builder\src\tools\mb\mb.py", line 63, in Main
    ret = self.args.func()
  File "C:\b\swarming\w\ir\cache\builder\src\tools\mb\mb.py", line 299, in CmdGen
    vals = self.Lookup()
  File "C:\b\swarming\w\ir\cache\builder\src\tools\mb\mb.py", line 601, in Lookup
    config = self.ConfigFromArgs()
  File "C:\b\swarming\w\ir\cache\builder\src\tools\mb\mb.py", line 683, in ConfigFromArgs
    (self.args.builder, self.args.master, self.args.config_file))
MBErr: Builder name "Win"  not found under masters[chromium] in "C:\b\swarming\w\ir\cache\builder\src\tools\mb\mb_config.pyl"
step returned non-zero exit code: 1

Original change's description:
> Rename main chromium builders
> 
> Uses the bit.ly/chromium-build-naming naming scheme.
> 
> Bug: 867725
> Change-Id: Id1d903c2a0d108c447a42919f3bfc72a917a4d18
> Reviewed-on: https://chromium-review.googlesource.com/1153616
> Reviewed-by: Dirk Pranke <dpranke@chromium.org>
> Commit-Queue: Stephen Martinis <martiniss@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#578829}

TBR=dpranke@chromium.org,martiniss@chromium.org,jbudorick@chromium.org

Change-Id: I1bc2dd5e461bdc8438a36e57a04ead43b5c0d76b
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 867725
Reviewed-on: https://chromium-review.googlesource.com/1153867Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#578837}

infra/config/global/cr-buildbucket.cfg

@@ -1634,7 +1634,7 @@ buckets {
       mixins: "lkgr-ci"
     }
     builders {
-      name: "win-rel"
+      name: "Win x64"
       dimensions: "os:Windows-10"
       dimensions: "cores:32"
       mixins: "chromium-ci"
@@ -1661,7 +1661,7 @@ buckets {
       mixins: "android-ci"
     }
     builders {
-      name: "android-rel"
+      name: "Android"
       dimensions: "os:Ubuntu-14.04"
       dimensions: "cores:32"
       mixins: "chromium-ci"
@@ -1901,7 +1901,7 @@ buckets {
       mixins: "android-fyi-ci"
     }
     builders {
-      name: "linux-rel"
+      name: "Linux x64"
       dimensions: "os:Ubuntu-14.04"
       dimensions: "cores:32"
       mixins: "chromium-ci"
@@ -2032,7 +2032,7 @@ buckets {
       mixins: "android-ci"
     }
     builders {
-      name: "mac-rel"
+      name: "Mac"
       dimensions: "os:Mac-10.13"
       mixins: "chromium-ci"
     }
@@ -2125,7 +2125,7 @@ buckets {
       mixins: "swarm-ci"
     }
     builders {
-      name: "win32-rel"
+      name: "Win"
       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/win32-rel"
+    name: "buildbucket/luci.chromium.ci/Win"
     category: "chromium|win"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/win-rel"
+    name: "buildbucket/luci.chromium.ci/Win x64"
     category: "chromium|win"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/mac-rel"
+    name: "buildbucket/luci.chromium.ci/Mac"
     category: "chromium"
     short_name: "mac"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/linux-rel"
+    name: "buildbucket/luci.chromium.ci/Linux x64"
     category: "chromium"
     short_name: "lin"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/android-rel"
+    name: "buildbucket/luci.chromium.ci/Android"
     category: "chromium"
     short_name: "and"
   }
@@ -1438,24 +1438,24 @@ consoles {
   manifest_name: "REVISION"
   include_experimental_builds: true
   builders {
-    name: "buildbucket/luci.chromium.ci/android-rel"
+    name: "buildbucket/luci.chromium.ci/Android"
     short_name: "an"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/linux-rel"
+    name: "buildbucket/luci.chromium.ci/Linux x64"
     short_name: "lnx"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/mac-rel"
+    name: "buildbucket/luci.chromium.ci/Mac"
     short_name: "mac"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/win32-rel"
+    name: "buildbucket/luci.chromium.ci/Win"
     category: "win"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/win-rel"
+    name: "buildbucket/luci.chromium.ci/Win x64"
     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-rel"
+  triggers: "Android"
   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-rel"
+  triggers: "Linux x64"
   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-rel"
+  triggers: "Mac"
   triggers: "Mojo Android"
   triggers: "Mojo ChromiumOS"
   triggers: "Mojo Linux"
@@ -202,8 +202,8 @@ trigger {
   triggers: "Win cl.exe Goma Canary LocalOutputCache"
   triggers: "Win x64 Builder (dbg)"
   triggers: "Win x64 Builder"
-  triggers: "win-rel"
-  triggers: "win32-rel"
+  triggers: "Win x64"
+  triggers: "Win"
   triggers: "Win7 Builder (dbg) Goma Canary"
   triggers: "Win7 Builder Goma Canary"
   triggers: "WinMSVC64 Goma Canary"
@@ -2267,12 +2267,12 @@ job {
 }
 
 job {
-  id: "android-rel"
+  id: "Android"
   acl_sets: "default"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "android-rel"
+    builder: "Android"
   }
 }
 
@@ -2824,12 +2824,12 @@ job {
 }
 
 job {
-  id: "linux-rel"
+  id: "Linux x64"
   acl_sets: "default"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "linux-rel"
+    builder: "Linux x64"
   }
 }
 
@@ -2880,12 +2880,12 @@ job {
 }
 
 job {
-  id: "mac-rel"
+  id: "Mac"
   acl_sets: "default"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "mac-rel"
+    builder: "Mac"
   }
 }
 
@@ -3287,12 +3287,12 @@ job {
 }
 
 job {
-  id: "win32-rel"
+  id: "Win"
   acl_sets: "default"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "win32-rel"
+    builder: "Win"
   }
 }
 
@@ -3373,12 +3373,12 @@ job {
 }
 
 job {
-  id: "win-rel"
+  id: "Win x64"
   acl_sets: "default"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "win-rel"
+    builder: "Win x64"
   }
 }
 

testing/buildbot/chromium.json

 {
   "AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {},
   "AAAAA2 See generate_buildbot_json.py to make changes": {},
-  "linux-rel": {
+  "Linux x64": {
     "additional_compile_targets": [
       "all"
     ],
@@ -15,7 +15,7 @@
       }
     ]
   },
-  "mac-rel": {
+  "Mac": {
     "additional_compile_targets": [
       "all"
     ],
@@ -29,7 +29,7 @@
       }
     ]
   },
-  "win-rel": {
+  "Win": {
     "additional_compile_targets": [
       "all"
     ],
@@ -40,7 +40,7 @@
       }
     ]
   },
-  "win32-rel": {
+  "Win x64": {
     "additional_compile_targets": [
       "all"
     ],

testing/buildbot/test_suite_exceptions.pyl

@@ -255,8 +255,8 @@
   },
   'checkbins': {
     'remove_from': [
-      'linux-rel',
-      'mac-rel',
+      'Linux x64',
+      'Mac',
     ],
   },
   'chrome_public_test_apk': {
@@ -1077,17 +1077,17 @@
   },
   'sizes': {
     'remove_from': [
-      'win32-rel',
-      'win-rel',
+      'Win',
+      'Win x64',
     ],
     'modifications': {
       # chromium
-      'mac-rel': {
+      'Mac': {
         'args': [
           'mac-release/sizes',
         ],
       },
-      'linux-rel': {
+      'Linux x64': {
         'args': [
           'linux-release-64/sizes',
         ],

testing/buildbot/waterfalls.pyl

@@ -12,7 +12,7 @@
   {
     'name': 'chromium',
     'machines': {
-      'linux-rel': {
+      'Linux x64': {
         'additional_compile_targets': [
           'all',
         ],
@@ -20,7 +20,7 @@
           'scripts': 'public_build_scripts',
         },
       },
-      'mac-rel': {
+      'Mac': {
         'additional_compile_targets': [
           'all',
         ],
@@ -28,7 +28,7 @@
           'scripts': 'public_build_scripts',
         },
       },
-      'win32-rel': {
+      'Win': {
         'additional_compile_targets': [
           'all',
         ],
@@ -36,7 +36,7 @@
           'scripts': 'public_build_scripts',
         },
       },
-      'win-rel': {
+      'Win x64': {
         'additional_compile_targets': [
           'all',
         ],

tools/mb/mb_config.pyl

@@ -24,11 +24,11 @@
     # generated publicly advertised non-Official builds which are not allowed
     # to have proprietary codecs enabled.
     'chromium': {
-      'android-rel': 'android_without_codecs_release_bot_minimal_symbols',
-      'linux-rel': 'release_bot',
-      'mac-rel': 'release_bot_mac_strip',
-      'win32-rel': 'release_bot_x86_minimal_symbols_enable_archive_compression',
-      'win-rel': 'release_bot_minimal_symbols_enable_archive_compression',
+      'Android': 'android_without_codecs_release_bot_minimal_symbols',
+      'Linux x64': 'release_bot',
+      'Mac': 'release_bot_mac_strip',
+      'Win': 'release_bot_x86_minimal_symbols_enable_archive_compression',
+      'Win x64': 'release_bot_minimal_symbols_enable_archive_compression',
     },
 
     'chromium.android': {