Rename "WebKit Mac10.11 (retina)" to "WebKit Mac10.12 (retina)"

src side CL. Build side is https://chromium-review.googlesource.com/c/chromium/tools/build/+/953260

NOTRY=true

Bug: 818524
Change-Id: I8eb2a70c80720ebaf0810536b3454eacb2d49f38
Reviewed-on: https://chromium-review.googlesource.com/953210
Commit-Queue: Stephen Martinis <martiniss@chromium.org>
Reviewed-by: Robert Ma <robertma@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Reviewed-by: Ryan Tseng <hinoka@chromium.org>
Cr-Commit-Position: refs/heads/master@{#542959}

infra/config/global/luci-milo-dev.cfg

@@ -644,9 +644,9 @@ consoles: {
     short_name: "11"
   }
   builders: {
-    name: "buildbot/chromium.webkit/WebKit Mac10.11 (retina)"
+    name: "buildbot/chromium.webkit/WebKit Mac10.12 (retina)"
     category: "chromium.webkit|mac|release"
-    short_name: "11r"
+    short_name: "12r"
   }
   builders: {
     name: "buildbot/chromium.webkit/WebKit Mac10.12"
@@ -1126,9 +1126,9 @@ consoles: {
     short_name: "11"
   }
   builders: {
-    name: "buildbot/chromium.webkit/WebKit Mac10.11 (retina)"
+    name: "buildbot/chromium.webkit/WebKit Mac10.12 (retina)"
     category: "mac|release"
-    short_name: "11r"
+    short_name: "12r"
   }
   builders: {
     name: "buildbot/chromium.webkit/WebKit Mac10.12"

infra/config/global/luci-milo.cfg

@@ -650,9 +650,9 @@ consoles: {
     short_name: "11"
   }
   builders: {
-    name: "buildbot/chromium.webkit/WebKit Mac10.11 (retina)"
+    name: "buildbot/chromium.webkit/WebKit Mac10.12 (retina)"
     category: "chromium.webkit|mac|release"
-    short_name: "11r"
+    short_name: "12r"
   }
   builders: {
     name: "buildbot/chromium.webkit/WebKit Mac10.12"
@@ -1144,9 +1144,9 @@ consoles: {
     short_name: "11"
   }
   builders: {
-    name: "buildbot/chromium.webkit/WebKit Mac10.11 (retina)"
+    name: "buildbot/chromium.webkit/WebKit Mac10.12 (retina)"
     category: "mac|release"
-    short_name: "11r"
+    short_name: "12r"
   }
   builders: {
     name: "buildbot/chromium.webkit/WebKit Mac10.12"
@@ -4918,7 +4918,7 @@ consoles: {
     name: "buildbot/tryserver.blink/mac10.11_blink_rel"
   }
   builders: {
-    name: "buildbot/tryserver.blink/mac10.11_retina_blink_rel"
+    name: "buildbot/tryserver.blink/mac10.12_retina_blink_rel"
   }
   builders: {
     name: "buildbot/tryserver.blink/mac10.12_blink_rel"

testing/buildbot/chromium.webkit.json

@@ -226,7 +226,7 @@
       }
     ]
   },
-  "WebKit Mac10.11 (retina)": {
+  "WebKit Mac10.12": {
     "isolated_scripts": [
       {
         "isolate_name": "webkit_layout_tests_exparchive",
@@ -242,10 +242,9 @@
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
-              "gpu": "1002:6821",
-              "hidpi": "1",
-              "os": "Mac-10.12.6",
-              "pool": "Chrome-GPU"
+              "gpu": "8086:0a2e",
+              "hidpi": "0",
+              "os": "Mac-10.12.6"
             }
           ],
           "shards": 6
@@ -253,7 +252,7 @@
       }
     ]
   },
-  "WebKit Mac10.12": {
+  "WebKit Mac10.12 (retina)": {
     "isolated_scripts": [
       {
         "isolate_name": "webkit_layout_tests_exparchive",
@@ -269,9 +268,10 @@
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
-              "gpu": "8086:0a2e",
-              "hidpi": "0",
-              "os": "Mac-10.12.6"
+              "gpu": "1002:6821",
+              "hidpi": "1",
+              "os": "Mac-10.12.6",
+              "pool": "Chrome-GPU"
             }
           ],
           "shards": 6

testing/buildbot/manage.py

@@ -59,7 +59,7 @@ SKIP = {
   'WebKit Mac10.11',
   'WebKit Mac10.12',
   'WebKit Mac10.11 (dbg)',
-  'WebKit Mac10.11 (retina)',
+  'WebKit Mac10.12 (retina)',
   'Chromium Mac10.10 Tests',
   'Chromium Mac10.11 Tests',
 

testing/buildbot/waterfalls.pyl

@@ -1838,7 +1838,7 @@
           ],
         },
       },
-      'WebKit Mac10.11 (retina)': {
+      'WebKit Mac10.12 (retina)': {
         'test_suites': {
           'isolated_scripts': 'chromium_webkit_isolated_scripts',
         },

third_party/WebKit/Tools/Scripts/webkitpy/common/config/builders.json

@@ -31,14 +31,14 @@
         "port_name": "mac-mac10.11",
         "specifiers": ["Mac10.11", "Debug"]
     },
-    "WebKit Mac10.11 (retina)": {
-        "port_name": "mac-retina",
-        "specifiers": ["Retina", "Release"]
-    },
     "WebKit Mac10.12": {
         "port_name": "mac-mac10.12",
         "specifiers": ["Mac10.12", "Release"]
     },
+    "WebKit Mac10.12 (retina)": {
+        "port_name": "mac-retina",
+        "specifiers": ["Retina", "Release"]
+    },
     "WebKit Android (Nexus4)": {
         "port_name": "android-kitkat",
         "specifiers": ["KitKat", "Release"]
@@ -62,16 +62,16 @@
         "specifiers": ["Mac10.11", "Release"],
         "is_try_builder": true
     },
-    "mac10.11_retina_blink_rel": {
-        "port_name": "mac-retina",
-        "specifiers": ["Retina", "Release"],
-        "is_try_builder": true
-    },
     "mac10.12_blink_rel": {
         "port_name": "mac-mac10.12",
         "specifiers": ["Mac10.12", "Release"],
         "is_try_builder": true
     },
+    "mac10.12_retina_blink_rel": {
+        "port_name": "mac-retina",
+        "specifiers": ["Retina", "Release"],
+        "is_try_builder": true
+    },
     "mac10.13_blink_rel": {
         "port_name": "mac-mac10.13",
         "specifiers": ["Mac10.13", "Release"],

tools/mb/mb_config.pyl

@@ -469,7 +469,7 @@
       'WebKit Linux Trusty': 'release_bot',
       'WebKit Mac Builder (dbg)': 'debug_bot',
       'WebKit Mac Builder': 'release_bot',
-      'WebKit Mac10.11 (retina)': 'release_bot',
+      'WebKit Mac10.12 (retina)': 'release_bot',
       'WebKit Mac10.12': 'release_bot',
       'WebKit Win Builder (dbg)': 'debug_bot_x86_minimal_symbols',
       'WebKit Win Builder': 'release_bot_x86_minimal_symbols',
@@ -534,7 +534,7 @@
       'linux_trusty_blink_rel': 'release_bot_minimal_symbols',
       'mac10.10_blink_rel': 'release_bot_minimal_symbols',
       'mac10.11_blink_rel': 'release_bot_minimal_symbols',
-      'mac10.11_retina_blink_rel': 'release_bot_minimal_symbols',
+      'mac10.12_retina_blink_rel': 'release_bot_minimal_symbols',
       'mac10.12_blink_rel': 'release_bot_minimal_symbols',
       'mac10.13_blink_rel': 'release_bot_minimal_symbols',
       'win7_blink_compile_dbg': 'debug_trybot_x86_minimal_symbols',