Update to use LUCI builders instead of master.tryserver.blink buildbot builders

Bug: 868202
Change-Id: Iee7e12d9aa5a1575d542739b99f351589f1ebb76
Reviewed-on: https://chromium-review.googlesource.com/c/1341241Reviewed-by: Quinten Yearsley <qyearsley@chromium.org>
Reviewed-by: Ryan Tseng <hinoka@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: Eric Foo <efoo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#609828}

docs/infra/cq_builders.md

@@ -119,6 +119,16 @@ builder.
     * [`//third_party/WebKit/LayoutTests/FlagExpectations/enable-blink-gen-property-trees`](https://cs.chromium.org/search/?q=package:%5Echromium$+file:third_party/WebKit/LayoutTests/FlagExpectations/enable-blink-gen-property-trees)
     * [`//third_party/WebKit/LayoutTests/flag-specific/enable-blink-gen-property-trees/.+`](https://cs.chromium.org/chromium/src/third_party/WebKit/LayoutTests/flag-specific/enable-blink-gen-property-trees/)
 
+* [linux-blink-rel](https://ci.chromium.org/p/chromium/builders/luci.chromium.try/linux-blink-rel) ([`cq.cfg` entry](https://cs.chromium.org/search/?q=package:%5Echromium$+file:cq.cfg+linux-blink-rel)) ([matching builders](https://cs.chromium.org/search/?q=file:trybots.py+linux-blink-rel))
+
+  Path regular expressions:
+    * [`//cc/.+`](https://cs.chromium.org/chromium/src/cc/)
+    * [`//third_party/WebKit/LayoutTests/FlagExpectations/(enable-slimming-paint-v2|enable-blink-gen-property-trees)`](https://cs.chromium.org/search/?q=package:%5Echromium$+file:third_party/WebKit/LayoutTests/FlagExpectations/(enable-slimming-paint-v2|enable-blink-gen-property-trees))
+    * [`//third_party/WebKit/LayoutTests/flag-specific/(enable-slimming-paint-v2|enable-blink-gen-property-trees)/.+`](https://cs.chromium.org/search/?q=package:%5Echromium$+file:third_party/WebKit/LayoutTests/flag-specific/(enable-slimming-paint-v2|enable-blink-gen-property-trees)/)
+    * [`//third_party/blink/renderer/core/layout/compositing/.+`](https://cs.chromium.org/chromium/src/third_party/blink/renderer/core/layout/compositing/)
+    * [`//third_party/blink/renderer/core/(svg|paint)/.+`](https://cs.chromium.org/search/?q=package:%5Echromium$+file:third_party/blink/renderer/core/(svg|paint)/)
+    * [`//third_party/blink/renderer/platform/graphics/.+`](https://cs.chromium.org/chromium/src/third_party/blink/renderer/platform/graphics/)
+
 * [linux_chromium_dbg_ng](https://ci.chromium.org/p/chromium/builders/luci.chromium.try/linux_chromium_dbg_ng) ([`cq.cfg` entry](https://cs.chromium.org/search/?q=package:%5Echromium$+file:cq.cfg+linux_chromium_dbg_ng)) ([matching builders](https://cs.chromium.org/search/?q=file:trybots.py+linux_chromium_dbg_ng))
 
   Path regular expressions:
@@ -192,16 +202,6 @@ builder.
     * [`//third_party/blink/renderer/platform/graphics/gpu/.+`](https://cs.chromium.org/chromium/src/third_party/blink/renderer/platform/graphics/gpu/)
     * [`//ui/gl/.+`](https://cs.chromium.org/chromium/src/ui/gl/)
 
-* [linux_trusty_blink_rel](https://ci.chromium.org/p/chromium/builders/luci.chromium.try/linux_trusty_blink_rel) ([`cq.cfg` entry](https://cs.chromium.org/search/?q=package:%5Echromium$+file:cq.cfg+linux_trusty_blink_rel)) ([matching builders](https://cs.chromium.org/search/?q=file:trybots.py+linux_trusty_blink_rel))
-
-  Path regular expressions:
-    * [`//cc/.+`](https://cs.chromium.org/chromium/src/cc/)
-    * [`//third_party/WebKit/LayoutTests/FlagExpectations/(enable-slimming-paint-v2|enable-blink-gen-property-trees)`](https://cs.chromium.org/search/?q=package:%5Echromium$+file:third_party/WebKit/LayoutTests/FlagExpectations/(enable-slimming-paint-v2|enable-blink-gen-property-trees))
-    * [`//third_party/WebKit/LayoutTests/flag-specific/(enable-slimming-paint-v2|enable-blink-gen-property-trees)/.+`](https://cs.chromium.org/search/?q=package:%5Echromium$+file:third_party/WebKit/LayoutTests/flag-specific/(enable-slimming-paint-v2|enable-blink-gen-property-trees)/)
-    * [`//third_party/blink/renderer/core/layout/compositing/.+`](https://cs.chromium.org/chromium/src/third_party/blink/renderer/core/layout/compositing/)
-    * [`//third_party/blink/renderer/core/(svg|paint)/.+`](https://cs.chromium.org/search/?q=package:%5Echromium$+file:third_party/blink/renderer/core/(svg|paint)/)
-    * [`//third_party/blink/renderer/platform/graphics/.+`](https://cs.chromium.org/chromium/src/third_party/blink/renderer/platform/graphics/)
-
 * [android_compile_x64_dbg](https://ci.chromium.org/p/chromium/builders/luci.chromium.try/android_compile_x64_dbg) ([`cq.cfg` entry](https://cs.chromium.org/search/?q=package:%5Echromium$+file:cq.cfg+android_compile_x64_dbg)) ([matching builders](https://cs.chromium.org/search/?q=file:trybots.py+android_compile_x64_dbg))
 
   Path regular expressions:

infra/config/branch/cq.cfg

@@ -130,6 +130,15 @@ verifiers {
         path_regexp: "third_party/WebKit/LayoutTests/FlagExpectations/enable-blink-gen-property-trees"
         path_regexp: "third_party/WebKit/LayoutTests/flag-specific/enable-blink-gen-property-trees/.+"
       }
+      builders {
+        name: "linux-blink-rel"
+        path_regexp: "cc/.+"
+        path_regexp: "third_party/WebKit/LayoutTests/FlagExpectations/(enable-slimming-paint-v2|enable-blink-gen-property-trees)"
+        path_regexp: "third_party/WebKit/LayoutTests/flag-specific/(enable-slimming-paint-v2|enable-blink-gen-property-trees)/.+"
+        path_regexp: "third_party/blink/renderer/core/layout/compositing/.+"
+        path_regexp: "third_party/blink/renderer/core/(svg|paint)/.+"
+        path_regexp: "third_party/blink/renderer/platform/graphics/.+"
+      }
       builders {
         name: "linux_chromium_dbg_ng"
         path_regexp: "build/.*check_gn_headers.*"
@@ -239,19 +248,6 @@ verifiers {
       }
     }
 
-    buckets {
-      name: "master.tryserver.blink"
-      builders {
-        name: "linux_trusty_blink_rel"
-        path_regexp: "cc/.+"
-        path_regexp: "third_party/WebKit/LayoutTests/FlagExpectations/(enable-slimming-paint-v2|enable-blink-gen-property-trees)"
-        path_regexp: "third_party/WebKit/LayoutTests/flag-specific/(enable-slimming-paint-v2|enable-blink-gen-property-trees)/.+"
-        path_regexp: "third_party/blink/renderer/core/layout/compositing/.+"
-        path_regexp: "third_party/blink/renderer/core/(svg|paint)/.+"
-        path_regexp: "third_party/blink/renderer/platform/graphics/.+"
-      }
-    }
-
     buckets {
       name: "master.tryserver.chromium.android"
       builders {

third_party/blink/tools/blinkpy/common/net/git_cl_mock.py

@@ -32,7 +32,7 @@ class MockGitCL(object):
         return 'mock output'
 
     def trigger_try_jobs(self, builders, bucket=None):
-        bucket = bucket or 'master.tryserver.blink'
+        bucket = bucket or 'luci.chromium.try'
         command = ['try', '-B', bucket]
         for builder in sorted(builders):
             command.extend(['-b', builder])

third_party/blink/tools/blinkpy/common/net/git_cl_unittest.py

@@ -39,7 +39,7 @@ class GitCLTest(unittest.TestCase):
         self.assertEqual(host.executive.calls, [['git', 'cl', 'issue']])
 
     def test_trigger_try_jobs_with_list(self):
-        # When no bucket is specified, master.tryserver.blink is used by
+        # When no bucket is specified, luci.chromium.try is used by
         # default. Besides, `git cl try` invocations are grouped by buckets.
         host = MockHost()
         git_cl = GitCL(host, auth_refresh_token_json='token.json')

third_party/blink/tools/blinkpy/tool/commands/rebaseline_cl_unittest.py

@@ -395,7 +395,7 @@ class RebaselineCLTest(BaseTestCase, LoggingTestCase):
         self.command.trigger_try_jobs(['MOCK Try Linux', 'MOCK Try Win'])
         self.assertEqual(
             self.command.git_cl.calls,
-            [['git', 'cl', 'try', '-B', 'master.tryserver.blink',
+            [['git', 'cl', 'try', '-B', 'luci.chromium.try',
               '-b', 'MOCK Try Linux', '-b', 'MOCK Try Win']])
         self.assertLog([
             'INFO: Triggering try jobs:\n',