Reland 'Use linux hosts for all mac triggered testers'

This is a reland of https://crrev.com/c/2161689, which was
reverted in https://crrev.com/c/2163254 due to breakages on
the branch builders. The prerequisite changes have been
cherry-picked to the currently active branches (m81 and m83),
so this should be safe to reland.

We've already shown this to work on Mac10.15 Tests on the FYI
waterfall, so let's do this for the rest of the Mac triggered
testers on the main waterfall as well. This will allow us to
free up some Mac resources to do more important tasks (e.g.
compile, run tests). It also makes these builders builderless,
increasing our flexibility and improving our utilization.

This CL also introduces a new ci.triggered_tester starlark
function to enable easily specifying builders as "we don't care
what OS you use", and to enable easily turning all of them into
"thin testers" if/when we go down that path.

Bug: 1061582
Change-Id: I31b80f76784cc909633056ff9c71e03ebaf31504
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2170416
Commit-Queue: Aaron Gable <agable@chromium.org>
Commit-Queue: Garrett Beaty <gbeaty@chromium.org>
Auto-Submit: Aaron Gable <agable@chromium.org>
Reviewed-by: Garrett Beaty <gbeaty@chromium.org>
Cr-Commit-Position: refs/heads/master@{#763416}

infra/config/lib/ci.star

@@ -874,6 +874,21 @@ def swangle_windows_builder(*, name, **kwargs):
   )
 
 
+def thin_tester(
+    *,
+    name,
+    mastername,
+    triggered_by,
+    **kwargs):
+  return ci.builder(
+      name = name,
+      mastername = mastername,
+      triggered_by = triggered_by,
+      goma_backend = None,
+      **kwargs
+  )
+
+
 def win_builder(*, name, os=builders.os.WINDOWS_DEFAULT, **kwargs):
   return ci.builder(
       name = name,
@@ -922,5 +937,6 @@ ci = struct(
     swangle_linux_builder = swangle_linux_builder,
     swangle_mac_builder = swangle_mac_builder,
     swangle_windows_builder = swangle_windows_builder,
+    thin_tester = thin_tester,
     win_builder = win_builder,
 )

infra/config/subprojects/chromium/ci.star

@@ -1776,17 +1776,6 @@ ci.fyi_builder(
     goma_backend = None,
 )
 
-# The only non-isolated tests this runs are scripts which
-# work just as well on Linux as on Mac.
-ci.fyi_builder(
-    name = 'Mac10.15 Tests',
-    console_view_entry = ci.console_view_entry(
-        category = 'mac',
-        short_name = '15',
-    ),
-    triggered_by = ['Mac Builder Next'],
-)
-
 ci.fyi_builder(
     name = 'win-pixel-builder-rel',
     console_view_entry = ci.console_view_entry(
@@ -2013,6 +2002,16 @@ ci.fyi_mac_builder(
     os = None,
 )
 
+ci.thin_tester(
+    name = 'Mac10.15 Tests',
+    mastername = 'chromium.fyi',
+    console_view_entry = ci.console_view_entry(
+        category = 'mac',
+        short_name = '15',
+    ),
+    triggered_by = ['Mac Builder Next'],
+)
+
 ci.fyi_mac_builder(
     name = 'Mac deterministic',
     console_view_entry = ci.console_view_entry(

infra/config/subprojects/chromium/versioned/m81/buckets/ci.star

@@ -308,9 +308,9 @@ ci.mac_builder(
     os = os.MAC_ANY,
 )
 
-# The build runs on 10.13, but triggers tests on 10.10 bots.
-ci.mac_builder(
+ci.thin_tester(
     name = 'Mac10.10 Tests',
+    mastername = 'chromium.mac',
     console_view_entry = ci.console_view_entry(
         category = 'release',
         short_name = '10',
@@ -318,9 +318,9 @@ ci.mac_builder(
     triggered_by = [builder_name('Mac Builder')],
 )
 
-# The build runs on 10.13, but triggers tests on 10.11 bots.
-ci.mac_builder(
+ci.thin_tester(
     name = 'Mac10.11 Tests',
+    mastername = 'chromium.mac',
     console_view_entry = ci.console_view_entry(
         category = 'release',
         short_name = '11',
@@ -328,53 +328,53 @@ ci.mac_builder(
     triggered_by = [builder_name('Mac Builder')],
 )
 
-ci.mac_builder(
+ci.thin_tester(
     name = 'Mac10.12 Tests',
+    mastername = 'chromium.mac',
     console_view_entry = ci.console_view_entry(
         category = 'release',
         short_name = '12',
     ),
-    os = os.MAC_10_12,
     triggered_by = [builder_name('Mac Builder')],
 )
 
-ci.mac_builder(
+ci.thin_tester(
     name = 'Mac10.13 Tests',
+    mastername = 'chromium.mac',
     console_view_entry = ci.console_view_entry(
         category = 'release',
         short_name = '13',
     ),
-    os = os.MAC_10_13,
     triggered_by = [builder_name('Mac Builder')],
 )
 
-ci.mac_builder(
+ci.thin_tester(
     name = 'Mac10.14 Tests',
+    mastername = 'chromium.mac',
     console_view_entry = ci.console_view_entry(
         category = 'release',
         short_name = '14',
     ),
-    os = os.MAC_10_14,
     triggered_by = [builder_name('Mac Builder')],
 )
 
-ci.mac_builder(
+ci.thin_tester(
     name = 'Mac10.13 Tests (dbg)',
+    mastername = 'chromium.mac',
     console_view_entry = ci.console_view_entry(
         category = 'debug',
         short_name = '13',
     ),
-    os = os.MAC_ANY,
     triggered_by = [builder_name('Mac Builder (dbg)')],
 )
 
-ci.mac_builder(
+ci.thin_tester(
     name = 'WebKit Mac10.13 (retina)',
+    mastername = 'chromium.mac',
     console_view_entry = ci.console_view_entry(
         category = 'release',
         short_name = 'ret',
     ),
-    os = os.MAC_10_13,
     triggered_by = [builder_name('Mac Builder')],
 )
 

infra/config/subprojects/chromium/versioned/m83/buckets/ci.star

@@ -619,9 +619,9 @@ ci.mac_builder(
     os = os.MAC_ANY,
 )
 
-# The build runs on 10.13, but triggers tests on 10.10 bots.
-ci.mac_builder(
+ci.thin_tester(
     name = 'Mac10.10 Tests',
+    mastername = 'chromium.mac',
     console_view_entry = ci.console_view_entry(
         category = 'release',
         short_name = '10',
@@ -629,9 +629,9 @@ ci.mac_builder(
     triggered_by = [builder_name('Mac Builder')],
 )
 
-# The build runs on 10.13, but triggers tests on 10.11 bots.
-ci.mac_builder(
+ci.thin_tester(
     name = 'Mac10.11 Tests',
+    mastername = 'chromium.mac',
     console_view_entry = ci.console_view_entry(
         category = 'release',
         short_name = '11',
@@ -639,53 +639,53 @@ ci.mac_builder(
     triggered_by = [builder_name('Mac Builder')],
 )
 
-ci.mac_builder(
+ci.thin_tester(
     name = 'Mac10.12 Tests',
+    mastername = 'chromium.mac',
     console_view_entry = ci.console_view_entry(
         category = 'release',
         short_name = '12',
     ),
-    os = os.MAC_10_12,
     triggered_by = [builder_name('Mac Builder')],
 )
 
-ci.mac_builder(
+ci.thin_tester(
     name = 'Mac10.13 Tests',
+    mastername = 'chromium.mac',
     console_view_entry = ci.console_view_entry(
         category = 'release',
         short_name = '13',
     ),
-    os = os.MAC_10_13,
     triggered_by = [builder_name('Mac Builder')],
 )
 
-ci.mac_builder(
+ci.thin_tester(
     name = 'Mac10.14 Tests',
+    mastername = 'chromium.mac',
     console_view_entry = ci.console_view_entry(
         category = 'release',
         short_name = '14',
     ),
-    os = os.MAC_10_14,
     triggered_by = [builder_name('Mac Builder')],
 )
 
-ci.mac_builder(
+ci.thin_tester(
     name = 'Mac10.13 Tests (dbg)',
+    mastername = 'chromium.mac',
     console_view_entry = ci.console_view_entry(
         category = 'debug',
         short_name = '13',
     ),
-    os = os.MAC_ANY,
     triggered_by = [builder_name('Mac Builder (dbg)')],
 )
 
-ci.mac_builder(
+ci.thin_tester(
     name = 'WebKit Mac10.13 (retina)',
+    mastername = 'chromium.mac',
     console_view_entry = ci.console_view_entry(
         category = 'release',
         short_name = 'ret',
     ),
-    os = os.MAC_10_13,
     triggered_by = [builder_name('Mac Builder')],
 )
 

infra/config/subprojects/chromium/versioned/trunk/buckets/ci.star

@@ -627,9 +627,9 @@ ci.mac_builder(
     os = os.MAC_ANY,
 )
 
-# The build runs on 10.13, but triggers tests on 10.10 bots.
-ci.mac_builder(
+ci.thin_tester(
     name = 'Mac10.10 Tests',
+    mastername = 'chromium.mac',
     console_view_entry = ci.console_view_entry(
         category = 'release',
         short_name = '10',
@@ -637,9 +637,9 @@ ci.mac_builder(
     triggered_by = [builder_name('Mac Builder')],
 )
 
-# The build runs on 10.13, but triggers tests on 10.11 bots.
-ci.mac_builder(
+ci.thin_tester(
     name = 'Mac10.11 Tests',
+    mastername = 'chromium.mac',
     console_view_entry = ci.console_view_entry(
         category = 'release',
         short_name = '11',
@@ -647,53 +647,53 @@ ci.mac_builder(
     triggered_by = [builder_name('Mac Builder')],
 )
 
-ci.mac_builder(
+ci.thin_tester(
     name = 'Mac10.12 Tests',
+    mastername = 'chromium.mac',
     console_view_entry = ci.console_view_entry(
         category = 'release',
         short_name = '12',
     ),
-    os = os.MAC_10_12,
     triggered_by = [builder_name('Mac Builder')],
 )
 
-ci.mac_builder(
+ci.thin_tester(
     name = 'Mac10.13 Tests',
+    mastername = 'chromium.mac',
     console_view_entry = ci.console_view_entry(
         category = 'release',
         short_name = '13',
     ),
-    os = os.MAC_10_13,
     triggered_by = [builder_name('Mac Builder')],
 )
 
-ci.mac_builder(
+ci.thin_tester(
     name = 'Mac10.14 Tests',
+    mastername = 'chromium.mac',
     console_view_entry = ci.console_view_entry(
         category = 'release',
         short_name = '14',
     ),
-    os = os.MAC_10_14,
     triggered_by = [builder_name('Mac Builder')],
 )
 
-ci.mac_builder(
+ci.thin_tester(
     name = 'Mac10.13 Tests (dbg)',
+    mastername = 'chromium.mac',
     console_view_entry = ci.console_view_entry(
         category = 'debug',
         short_name = '13',
     ),
-    os = os.MAC_ANY,
     triggered_by = [builder_name('Mac Builder (dbg)')],
 )
 
-ci.mac_builder(
+ci.thin_tester(
     name = 'WebKit Mac10.13 (retina)',
+    mastername = 'chromium.mac',
     console_view_entry = ci.console_view_entry(
         category = 'release',
         short_name = 'ret',
     ),
-    os = os.MAC_10_13,
     triggered_by = [builder_name('Mac Builder')],
 )