Revert "Make Mac10.X Tests builders into thin testers"

This reverts commit 630672d6.

Reason for revert: attempts to extract linux build: https://ci.chromium.org/p/chromium/builders/ci/Mac10.13%20Tests/20794

Original change's description:
> Make Mac10.X Tests builders into thin testers
> 
> This will free up a small amount of Mac hardware which can be
> used elsewhere. It also creates a template for other OSes with
> builder/tester splits to follow.
> 
> We know that this works because the mac-osxbeta-rel CI builder
> already does this (as can be seen by the smaller diff in its
> generated config).
> 
> Bug: 1003062
> Change-Id: Iecdb68404dd3ae16eabfc657981f0e82478a040a
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1974510
> Auto-Submit: Garrett Beaty <gbeaty@chromium.org>
> Reviewed-by: Stephen Martinis <martiniss@chromium.org>
> Commit-Queue: Stephen Martinis <martiniss@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#726077}

TBR=agable@chromium.org,martiniss@chromium.org,gbeaty@chromium.org

Change-Id: Ide3b7335f67e1b48cbaf0cb1a9c69ce4211c0f33
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1003062
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1974614Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: John Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#726105}

infra/config/buckets/ci.star

@@ -1293,6 +1293,12 @@ fyi_mac_builder(
     os = os.MAC_10_14,
 )
 
+fyi_mac_builder(
+    name = 'Mac10.14 Tests',
+    cores = None,
+    os = os.MAC_10_14,
+)
+
 fyi_mac_builder(
     name = 'Mac deterministic',
     cores = None,
@@ -1916,6 +1922,11 @@ mac_builder(
     os = os.MAC_ANY,
 )
 
+mac_builder(
+    name = 'Mac10.13 Tests (dbg)',
+    os = os.MAC_ANY,
+)
+
 def mac_ios_builder(*, name, **kwargs):
   return mac_builder(
       name = name,
@@ -2159,31 +2170,6 @@ swangle_windows_builder(
 )
 
 
-# Thin testers are triggered builders which simply trigger swarmed
-# tests and collect their results. The OS they run on doesn't matter,
-# and they don't do anything computationally intensive, so use 2-core
-# Linux hosts.
-def thin_tester(*, name, mastername, **kwargs):
-  return builder(
-      name = name,
-      mastername = mastername,
-      builderless = True,
-      cores = 2,
-      os = os.LINUX_DEFAULT,
-      **kwargs
-  )
-
-thin_tester(
-    name = 'Mac10.13 Tests (dbg)',
-    mastername = 'chromium.mac',
-)
-
-thin_tester(
-    name = 'Mac10.14 Tests',
-    mastername = 'chromium.fyi',
-)
-
-
 def win_builder(*, name, os=os.WINDOWS_DEFAULT, **kwargs):
   return builder(
       name = name,

infra/config/versioned/milestones/m79/buckets/ci.star

@@ -96,6 +96,13 @@ def fyi_builder(
       **kwargs
   )
 
+# This is launching & collecting entirely isolated tests.
+# OS shouldn't matter.
+fyi_builder(
+    name = 'mac-osxbeta-rel',
+    goma_backend = goma.backend.RBE_PROD,
+)
+
 
 def fyi_windows_builder(*, name, os=os.WINDOWS_DEFAULT, **kwargs):
   return fyi_builder(
@@ -206,64 +213,44 @@ mac_builder(
     name = 'Mac Builder',
 )
 
-
-def mac_ios_builder(*, name, **kwargs):
-  return mac_builder(
-      name = name,
-      caches = [XCODE_IOS_11_CACHE],
-      executable = luci.recipe(name = 'ios/unified_builder_tester'),
-      goma_backend = None,
-      os = os.MAC_ANY,
-      **kwargs
-  )
-
-mac_ios_builder(
-    name = 'ios-simulator',
-)
-
-
-# Thin testers are triggered builders which simply trigger swarmed
-# tests and collect their results. The OS they run on doesn't matter,
-# and they don't do anything computationally intensive, so use 2-core
-# Linux hosts.
-def thin_tester(*, name, mastername, **kwargs):
-  return builder(
-      name = name,
-      mastername = mastername,
-      builderless = True,
-      cores = 2,
-      os = os.LINUX_DEFAULT,
-      **kwargs
-  )
-
-thin_tester(
+# The build runs on 10.13, but triggers tests on 10.10 bots.
+mac_builder(
     name = 'Mac10.10 Tests',
-    mastername = 'chromium.mac',
 )
 
-thin_tester(
+# The build runs on 10.13, but triggers tests on 10.11 bots.
+mac_builder(
     name = 'Mac10.11 Tests',
-    mastername = 'chromium.mac',
 )
 
-thin_tester(
+mac_builder(
     name = 'Mac10.12 Tests',
-    mastername = 'chromium.mac',
+    os = os.MAC_10_12,
 )
 
-thin_tester(
+mac_builder(
     name = 'Mac10.13 Tests',
-    mastername = 'chromium.mac',
+    os = os.MAC_10_13,
 )
 
-thin_tester(
+mac_builder(
     name = 'WebKit Mac10.13 (retina)',
-    mastername = 'chromium.mac',
+    os = os.MAC_10_13,
 )
 
-thin_tester(
-    name = 'mac-osxbeta-rel',
-    mastername = 'chromium.fyi',
+
+def mac_ios_builder(*, name, **kwargs):
+  return mac_builder(
+      name = name,
+      caches = [XCODE_IOS_11_CACHE],
+      executable = luci.recipe(name = 'ios/unified_builder_tester'),
+      goma_backend = None,
+      os = os.MAC_ANY,
+      **kwargs
+  )
+
+mac_ios_builder(
+    name = 'ios-simulator',
 )
 
 

infra/config/versioned/milestones/m80/buckets/ci.star

@@ -96,6 +96,13 @@ def fyi_builder(
       **kwargs
   )
 
+# This is launching & collecting entirely isolated tests.
+# OS shouldn't matter.
+fyi_builder(
+    name = 'mac-osxbeta-rel',
+    goma_backend = goma.backend.RBE_PROD,
+)
+
 
 def fyi_windows_builder(*, name, os=os.WINDOWS_DEFAULT, **kwargs):
   return fyi_builder(
@@ -206,64 +213,44 @@ mac_builder(
     name = 'Mac Builder',
 )
 
-
-def mac_ios_builder(*, name, **kwargs):
-  return mac_builder(
-      name = name,
-      caches = [XCODE_IOS_11_CACHE],
-      executable = luci.recipe(name = 'ios/unified_builder_tester'),
-      goma_backend = None,
-      os = os.MAC_ANY,
-      **kwargs
-  )
-
-mac_ios_builder(
-    name = 'ios-simulator',
-)
-
-
-# Thin testers are triggered builders which simply trigger swarmed
-# tests and collect their results. The OS they run on doesn't matter,
-# and they don't do anything computationally intensive, so use 2-core
-# Linux hosts.
-def thin_tester(*, name, mastername, **kwargs):
-  return builder(
-      name = name,
-      mastername = mastername,
-      builderless = True,
-      cores = 2,
-      os = os.LINUX_DEFAULT,
-      **kwargs
-  )
-
-thin_tester(
+# The build runs on 10.13, but triggers tests on 10.10 bots.
+mac_builder(
     name = 'Mac10.10 Tests',
-    mastername = 'chromium.mac',
 )
 
-thin_tester(
+# The build runs on 10.13, but triggers tests on 10.11 bots.
+mac_builder(
     name = 'Mac10.11 Tests',
-    mastername = 'chromium.mac',
 )
 
-thin_tester(
+mac_builder(
     name = 'Mac10.12 Tests',
-    mastername = 'chromium.mac',
+    os = os.MAC_10_12,
 )
 
-thin_tester(
+mac_builder(
     name = 'Mac10.13 Tests',
-    mastername = 'chromium.mac',
+    os = os.MAC_10_13,
 )
 
-thin_tester(
+mac_builder(
     name = 'WebKit Mac10.13 (retina)',
-    mastername = 'chromium.mac',
+    os = os.MAC_10_13,
 )
 
-thin_tester(
-    name = 'mac-osxbeta-rel',
-    mastername = 'chromium.fyi',
+
+def mac_ios_builder(*, name, **kwargs):
+  return mac_builder(
+      name = name,
+      caches = [XCODE_IOS_11_CACHE],
+      executable = luci.recipe(name = 'ios/unified_builder_tester'),
+      goma_backend = None,
+      os = os.MAC_ANY,
+      **kwargs
+  )
+
+mac_ios_builder(
+    name = 'ios-simulator',
 )
 
 

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

@@ -96,6 +96,13 @@ def fyi_builder(
       **kwargs
   )
 
+# This is launching & collecting entirely isolated tests.
+# OS shouldn't matter.
+fyi_builder(
+    name = 'mac-osxbeta-rel',
+    goma_backend = goma.backend.RBE_PROD,
+)
+
 
 def fyi_windows_builder(*, name, os=os.WINDOWS_DEFAULT, **kwargs):
   return fyi_builder(
@@ -206,64 +213,44 @@ mac_builder(
     name = 'Mac Builder',
 )
 
-
-def mac_ios_builder(*, name, **kwargs):
-  return mac_builder(
-      name = name,
-      caches = [XCODE_IOS_11_CACHE],
-      executable = luci.recipe(name = 'ios/unified_builder_tester'),
-      goma_backend = None,
-      os = os.MAC_ANY,
-      **kwargs
-  )
-
-mac_ios_builder(
-    name = 'ios-simulator',
-)
-
-
-# Thin testers are triggered builders which simply trigger swarmed
-# tests and collect their results. The OS they run on doesn't matter,
-# and they don't do anything computationally intensive, so use 2-core
-# Linux hosts.
-def thin_tester(*, name, mastername, **kwargs):
-  return builder(
-      name = name,
-      mastername = mastername,
-      builderless = True,
-      cores = 2,
-      os = os.LINUX_DEFAULT,
-      **kwargs
-  )
-
-thin_tester(
+# The build runs on 10.13, but triggers tests on 10.10 bots.
+mac_builder(
     name = 'Mac10.10 Tests',
-    mastername = 'chromium.mac',
 )
 
-thin_tester(
+# The build runs on 10.13, but triggers tests on 10.11 bots.
+mac_builder(
     name = 'Mac10.11 Tests',
-    mastername = 'chromium.mac',
 )
 
-thin_tester(
+mac_builder(
     name = 'Mac10.12 Tests',
-    mastername = 'chromium.mac',
+    os = os.MAC_10_12,
 )
 
-thin_tester(
+mac_builder(
     name = 'Mac10.13 Tests',
-    mastername = 'chromium.mac',
+    os = os.MAC_10_13,
 )
 
-thin_tester(
+mac_builder(
     name = 'WebKit Mac10.13 (retina)',
-    mastername = 'chromium.mac',
+    os = os.MAC_10_13,
 )
 
-thin_tester(
-    name = 'mac-osxbeta-rel',
-    mastername = 'chromium.fyi',
+
+def mac_ios_builder(*, name, **kwargs):
+  return mac_builder(
+      name = name,
+      caches = [XCODE_IOS_11_CACHE],
+      executable = luci.recipe(name = 'ios/unified_builder_tester'),
+      goma_backend = None,
+      os = os.MAC_ANY,
+      **kwargs
+  )
+
+mac_ios_builder(
+    name = 'ios-simulator',
 )