Flip linux-rel and it's mirrors to set builder_group property.

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

infra/config/generated/cr-buildbucket.cfg

@@ -2810,7 +2810,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"bucketed_triggers\":true},\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"mastername\":\"chromium.gpu\",\"recipe\":\"chromium\"}"
+      properties: "{\"$build/chromium_tests\":{\"bucketed_triggers\":true},\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"builder_group\":\"chromium.gpu\",\"mastername\":\"chromium.gpu\",\"recipe\":\"chromium\"}"
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -3470,7 +3470,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"bucketed_triggers\":true},\"$build/goma\":{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"mastername\":\"chromium.linux\",\"recipe\":\"chromium\"}"
+      properties: "{\"$build/chromium_tests\":{\"bucketed_triggers\":true},\"$build/goma\":{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"builder_group\":\"chromium.linux\",\"mastername\":\"chromium.linux\",\"recipe\":\"chromium\"}"
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -4311,7 +4311,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"bucketed_triggers\":true},\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"mastername\":\"chromium.gpu\",\"recipe\":\"chromium\"}"
+      properties: "{\"$build/chromium_tests\":{\"bucketed_triggers\":true},\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"builder_group\":\"chromium.gpu\",\"mastername\":\"chromium.gpu\",\"recipe\":\"chromium\"}"
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -4398,7 +4398,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"bucketed_triggers\":true},\"$build/goma\":{\"jobs\":500},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"mastername\":\"chromium.linux\",\"recipe\":\"chromium\"}"
+      properties: "{\"$build/chromium_tests\":{\"bucketed_triggers\":true},\"$build/goma\":{\"jobs\":500},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"builder_group\":\"chromium.linux\",\"mastername\":\"chromium.linux\",\"recipe\":\"chromium\"}"
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -25521,7 +25521,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/code_coverage\":{\"use_clang_coverage\":true},\"$build/goma\":{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"mastername\":\"tryserver.chromium.linux\",\"recipe\":\"chromium_trybot\"}"
+      properties: "{\"$build/code_coverage\":{\"use_clang_coverage\":true},\"$build/goma\":{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"builder_group\":\"tryserver.chromium.linux\",\"mastername\":\"tryserver.chromium.linux\",\"recipe\":\"chromium_trybot\"}"
       execution_timeout_secs: 14400
       expiration_secs: 7200
       caches {

infra/config/lib/builders.star

@@ -344,7 +344,9 @@ def builder(
       * mastername - a string with the group of the builder. Emits a property
         of the form 'mastername:<mastername>'. By default, considered None.
         Other than the property emitted, should be treated the same as
-        builder_group. At most one of builder_group or mastername can be set.
+        builder_group. If builder_group is set, mastername is ignored except
+        that it is treated as an error if both builder_group and mastername are
+        set and are set to different values.
       * cores - an int indicating the number of cores the builder requires for the
         machines that run it. Emits a dimension of the form 'cores:<cores>' will
         be emitted. By default, considered None.
@@ -465,8 +467,8 @@ def builder(
 
     builder_group = defaults.get_value("builder_group", builder_group)
     mastername = defaults.get_value("mastername", mastername)
-    if builder_group != None and mastername != None:
-        fail("builder_group and mastername cannot both be set")
+    if builder_group != None and mastername != None and builder_group != mastername:
+        fail("mastername ({}) does not match builder_group ({})".format(mastername, builder_group))
 
     if builder_group != None:
         properties["builder_group"] = builder_group

infra/config/subprojects/chromium/ci.star

@@ -776,6 +776,9 @@ ci.gpu_builder(
 
 ci.gpu_builder(
     name = "GPU Linux Builder",
+    # 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 = "Linux",
     ),
@@ -801,6 +804,9 @@ ci.gpu_builder(
 
 ci.gpu_thin_tester(
     name = "Linux Release (NVIDIA)",
+    # 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 = "Linux",
     ),
@@ -863,6 +869,9 @@ ci.linux_builder(
 
 ci.linux_builder(
     name = "Linux Builder",
+    # 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 = "release",
         short_name = "bld",
@@ -881,6 +890,9 @@ ci.linux_builder(
 
 ci.linux_builder(
     name = "Linux Tests",
+    # 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 = "release",
         short_name = "tst",

infra/config/subprojects/chromium/try.star

@@ -388,6 +388,9 @@ try_.chromium_linux_builder(
 
 try_.chromium_linux_builder(
     name = "linux-rel",
+    # TODO(https://crbug.com/1109276) Once support for mastername is removed, do
+    # not explicitly set
+    builder_group = "tryserver.chromium.linux",
     goma_jobs = goma.jobs.J150,
     tryjob = try_.job(),
     use_clang_coverage = True,