Flip builders to use builder_group property instead of mastername.

Bug: 1109276
Change-Id: Ic6be3f297401bce87019ef398271769da515de4c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2380256
Auto-Submit: Garrett Beaty <gbeaty@chromium.org>
Reviewed-by: Erik Staab <estaab@chromium.org>
Commit-Queue: Erik Staab <estaab@chromium.org>
Cr-Commit-Position: refs/heads/master@{#802293}

infra/config/subprojects/chromium/ci.star

@@ -680,6 +680,9 @@ ci.android_builder(
 ci.android_builder(
     name = "android-cronet-arm-rel",
     branch_selector = branches.STANDARD_RELEASES,
+    # TODO(https://crbug.com/1109276) Once support for mastername is removed, do
+    # not explicitly set
+    builder_group = "chromium.android",
     console_view_entry = ci.console_view_entry(
         category = "cronet|arm",
         short_name = "rel",
@@ -1138,6 +1141,9 @@ ci.chromiumos_builder(
 ci.chromiumos_builder(
     name = "chromeos-amd64-generic-rel",
     branch_selector = branches.ALL_RELEASES,
+    # TODO(https://crbug.com/1109276) Once support for mastername is removed, do
+    # not explicitly set
+    builder_group = "chromium.chromiumos",
     console_view_entry = ci.console_view_entry(
         category = "simple|release|x64",
         short_name = "rel",
@@ -3006,6 +3012,9 @@ ci.gpu_builder(
 ci.gpu_builder(
     name = "GPU Mac Builder",
     branch_selector = branches.STANDARD_RELEASES,
+    # TODO(https://crbug.com/1109276) Once support for mastername is removed, do
+    # not explicitly set
+    builder_group = "chromium.gpu",
     console_view_entry = ci.console_view_entry(
         category = "Mac",
     ),
@@ -3028,6 +3037,9 @@ ci.gpu_builder(
 ci.gpu_builder(
     name = "GPU Win x64 Builder",
     branch_selector = branches.STANDARD_RELEASES,
+    # TODO(https://crbug.com/1109276) Once support for mastername is removed, do
+    # not explicitly set
+    builder_group = "chromium.gpu",
     builderless = True,
     console_view_entry = ci.console_view_entry(
         category = "Windows",
@@ -3082,6 +3094,9 @@ ci.gpu_thin_tester(
 ci.gpu_thin_tester(
     name = "Mac Release (Intel)",
     branch_selector = branches.STANDARD_RELEASES,
+    # TODO(https://crbug.com/1109276) Once support for mastername is removed, do
+    # not explicitly set
+    builder_group = "chromium.gpu",
     console_view_entry = ci.console_view_entry(
         category = "Mac",
     ),
@@ -3102,6 +3117,9 @@ ci.gpu_thin_tester(
 ci.gpu_thin_tester(
     name = "Mac Retina Release (AMD)",
     branch_selector = branches.STANDARD_RELEASES,
+    # TODO(https://crbug.com/1109276) Once support for mastername is removed, do
+    # not explicitly set
+    builder_group = "chromium.gpu",
     console_view_entry = ci.console_view_entry(
         category = "Mac",
     ),
@@ -3122,6 +3140,9 @@ ci.gpu_thin_tester(
 ci.gpu_thin_tester(
     name = "Win10 x64 Release (NVIDIA)",
     branch_selector = branches.STANDARD_RELEASES,
+    # TODO(https://crbug.com/1109276) Once support for mastername is removed, do
+    # not explicitly set
+    builder_group = "chromium.gpu",
     console_view_entry = ci.console_view_entry(
         category = "Windows",
     ),
@@ -4050,6 +4071,9 @@ ci.linux_builder(
 ci.linux_builder(
     name = "fuchsia-x64-cast",
     branch_selector = branches.STANDARD_RELEASES,
+    # TODO(https://crbug.com/1109276) Once support for mastername is removed, do
+    # not explicitly set
+    builder_group = "chromium.linux",
     console_view_entry = ci.console_view_entry(
         category = "fuchsia|cast",
         short_name = "x64",
@@ -4168,6 +4192,9 @@ ci.linux_builder(
 ci.mac_builder(
     name = "Mac Builder",
     branch_selector = branches.STANDARD_RELEASES,
+    # TODO(https://crbug.com/1109276) Once support for mastername is removed, do
+    # not explicitly set
+    builder_group = "chromium.mac",
     console_view_entry = ci.console_view_entry(
         category = "release",
         short_name = "bld",
@@ -4243,6 +4270,9 @@ ci.thin_tester(
 ci.thin_tester(
     name = "Mac10.13 Tests",
     branch_selector = branches.STANDARD_RELEASES,
+    # TODO(https://crbug.com/1109276) Once support for mastername is removed, do
+    # not explicitly set
+    builder_group = "chromium.mac",
     mastername = "chromium.mac",
     console_view_entry = ci.console_view_entry(
         category = "release",
@@ -4306,6 +4336,9 @@ ci.mac_ios_builder(
 ci.mac_ios_builder(
     name = "ios-simulator",
     branch_selector = branches.STANDARD_RELEASES,
+    # TODO(https://crbug.com/1109276) Once support for mastername is removed, do
+    # not explicitly set
+    builder_group = "chromium.mac",
     console_view_entry = ci.console_view_entry(
         category = "ios|default",
         short_name = "sim",
@@ -4805,6 +4838,9 @@ ci.win_builder(
 ci.win_builder(
     name = "Win x64 Builder",
     branch_selector = branches.STANDARD_RELEASES,
+    # TODO(https://crbug.com/1109276) Once support for mastername is removed, do
+    # not explicitly set
+    builder_group = "chromium.win",
     console_view_entry = ci.console_view_entry(
         category = "release|builder",
         short_name = "64",
@@ -4818,6 +4854,9 @@ ci.win_builder(
 ci.win_builder(
     name = "Win10 Tests x64",
     branch_selector = branches.STANDARD_RELEASES,
+    # TODO(https://crbug.com/1109276) Once support for mastername is removed, do
+    # not explicitly set
+    builder_group = "chromium.win",
     console_view_entry = ci.console_view_entry(
         category = "release|tester",
         short_name = "w10",

infra/config/subprojects/chromium/try.star

@@ -423,6 +423,9 @@ try_.chromium_android_builder(
 try_.chromium_android_builder(
     name = "android_cronet",
     branch_selector = branches.STANDARD_RELEASES,
+    # TODO(https://crbug.com/1109276) Once support for mastername is removed, do
+    # not explicitly set
+    builder_group = "tryserver.chromium.android",
     main_list_view = settings.main_list_view_name,
     tryjob = try_.job(),
 )
@@ -539,6 +542,9 @@ try_.chromium_chromiumos_builder(
 try_.chromium_chromiumos_builder(
     name = "chromeos-amd64-generic-rel",
     branch_selector = branches.ALL_RELEASES,
+    # TODO(https://crbug.com/1109276) Once support for mastername is removed, do
+    # not explicitly set
+    builder_group = "tryserver.chromium.chromiumos",
     main_list_view = settings.main_list_view_name,
     tryjob = try_.job(),
 )
@@ -779,6 +785,9 @@ try_.chromium_linux_builder(
 try_.chromium_linux_builder(
     name = "fuchsia-x64-cast",
     branch_selector = branches.STANDARD_RELEASES,
+    # TODO(https://crbug.com/1109276) Once support for mastername is removed, do
+    # not explicitly set
+    builder_group = "tryserver.chromium.linux",
     main_list_view = settings.main_list_view_name,
     tryjob = try_.job(),
 )
@@ -1099,6 +1108,9 @@ try_.chromium_mac_builder(
 
 try_.chromium_mac_builder(
     name = "mac-rel",
+    # TODO(https://crbug.com/1109276) Once support for mastername is removed, do
+    # not explicitly set
+    builder_group = "tryserver.chromium.mac",
     branch_selector = branches.STANDARD_RELEASES,
     goma_jobs = goma.jobs.J150,
     main_list_view = settings.main_list_view_name,
@@ -1194,6 +1206,9 @@ try_.chromium_mac_ios_builder(
 try_.chromium_mac_ios_builder(
     name = "ios-simulator",
     branch_selector = branches.STANDARD_RELEASES,
+    # TODO(https://crbug.com/1109276) Once support for mastername is removed, do
+    # not explicitly set
+    builder_group = "tryserver.chromium.mac",
     executable = "recipe:chromium_trybot",
     main_list_view = settings.main_list_view_name,
     properties = {
@@ -1386,6 +1401,9 @@ try_.chromium_win_builder(
 try_.chromium_win_builder(
     name = "win10_chromium_x64_rel_ng",
     branch_selector = branches.STANDARD_RELEASES,
+    # TODO(https://crbug.com/1109276) Once support for mastername is removed, do
+    # not explicitly set
+    builder_group = "tryserver.chromium.win",
     goma_jobs = goma.jobs.J150,
     os = os.WINDOWS_10,
     ssd = True,