infra: Set `enable_ats` value in builders.star

We want to enable ATS for all builders using an RBE backend.

This will be done programmatically in builders.star, so that we don't
have to update builder configs individually.

In this CL, we test out this feature on Windows builders currently using
RBE.

This should be a no-op for generated builder configs. The only changes
in cr-buildbucket.cfg are to these builders' configs:
- win-celab-tester-rel: test-only, unaffected by goma flags
- win-pixel-builder-rel: did not explicitly specify because it is
  assigned a Windows 10 bot elsewhere, added explicit Windows 10 value.

R=agable@chromium.org, gbeaty@chromium.org, tikuta@chromium.org

Bug: 1040754
Change-Id: If7e97e1a444527b5e72413988f02108b06870ac6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2004186Reviewed-by: Takuto Ikuta <tikuta@chromium.org>
Commit-Queue: Simon Que <sque@chromium.org>
Cr-Commit-Position: refs/heads/master@{#732291}

infra/config/buckets/ci.star

@@ -408,28 +408,24 @@ chromium_builder(
 chromium_builder(
     name = 'win-archive-dbg',
     cores = 32,
-    goma_enable_ats = True,
     os = os.WINDOWS_DEFAULT,
 )
 
 chromium_builder(
     name = 'win-archive-rel',
     cores = 32,
-    goma_enable_ats = True,
     os = os.WINDOWS_DEFAULT,
 )
 
 chromium_builder(
     name = 'win32-archive-dbg',
     cores = 32,
-    goma_enable_ats = True,
     os = os.WINDOWS_DEFAULT,
 )
 
 chromium_builder(
     name = 'win32-archive-rel',
     cores = 32,
-    goma_enable_ats = True,
     os = os.WINDOWS_DEFAULT,
 )
 
@@ -763,13 +759,11 @@ dawn_builder(
 
 dawn_builder(
     name = 'Dawn Win10 x86 Builder',
-    goma_enable_ats = True,
     os = os.WINDOWS_ANY,
 )
 
 dawn_builder(
     name = 'Dawn Win10 x64 Builder',
-    goma_enable_ats = True,
     os = os.WINDOWS_ANY,
 )
 
@@ -801,13 +795,11 @@ dawn_builder(
 
 dawn_builder(
     name = 'Dawn Win10 x86 DEPS Builder',
-    goma_enable_ats = True,
     os = os.WINDOWS_ANY,
 )
 
 dawn_builder(
     name = 'Dawn Win10 x64 DEPS Builder',
-    goma_enable_ats = True,
     os = os.WINDOWS_ANY,
 )
 
@@ -919,14 +911,12 @@ fuzz_builder(
 fuzz_builder(
     name = 'Win ASan Release',
     builderless = False,
-    goma_enable_ats = True,
     os = os.WINDOWS_DEFAULT,
 )
 
 fuzz_builder(
     name = 'Win ASan Release Media',
     builderless = False,
-    goma_enable_ats = True,
     os = os.WINDOWS_DEFAULT
 )
 
@@ -993,7 +983,6 @@ fuzz_libfuzzer_builder(
 
 fuzz_libfuzzer_builder(
     name = 'Libfuzzer Upload Windows ASan',
-    goma_enable_ats = True,
     os = os.WINDOWS_DEFAULT,
 )
 
@@ -1122,8 +1111,7 @@ fyi_builder(
 
 fyi_builder(
     name = 'win-pixel-builder-rel',
-    goma_enable_ats = True,
-    os = None,
+    os = os.WINDOWS_10,
 )
 
 fyi_builder(
@@ -1150,7 +1138,6 @@ def fyi_celab_builder(*, name, **kwargs):
 
 fyi_celab_builder(
     name = 'win-celab-builder-rel',
-    goma_enable_ats = True,
 )
 
 fyi_celab_builder(
@@ -1218,7 +1205,6 @@ fyi_coverage_builder(
 fyi_coverage_builder(
     name = 'win10-code-coverage',
     builderless = True,
-    goma_enable_ats = True,
     os = os.WINDOWS_DEFAULT,
     use_clang_coverage = True,
 )
@@ -1324,7 +1310,6 @@ def fyi_windows_builder(*, name, os=os.WINDOWS_DEFAULT, **kwargs):
   return fyi_builder(
       name = name,
       goma_backend = goma.backend.RBE_PROD,
-      goma_enable_ats = True,
       os = os,
       **kwargs
   )
@@ -1700,7 +1685,6 @@ def gpu_fyi_windows_builder(*, name, **kwargs):
       name = name,
       builderless = True,
       goma_backend = goma.backend.RBE_PROD,
-      goma_enable_ats = True,
       os = os.WINDOWS_ANY,
       **kwargs
   )
@@ -1763,7 +1747,6 @@ gpu_builder(
 gpu_builder(
     name = 'GPU Win x64 Builder (dbg)',
     builderless = True,
-    goma_enable_ats = True,
     os = os.WINDOWS_ANY,
 )
 
@@ -2070,7 +2053,6 @@ memory_builder(
 memory_builder(
     name = 'win-asan',
     cores = 32,
-    goma_enable_ats = True,
     builderless = True,
     os = os.WINDOWS_DEFAULT,
 )
@@ -2126,7 +2108,6 @@ def swangle_windows_builder(*, name, **kwargs):
   return swangle_builder(
       name = name,
       goma_backend = goma.backend.RBE_PROD,
-      goma_enable_ats = True,
       os = os.WINDOWS_DEFAULT,
       **kwargs
   )
@@ -2160,7 +2141,6 @@ def win_builder(*, name, os=os.WINDOWS_DEFAULT, **kwargs):
   return builder(
       name = name,
       goma_backend = goma.backend.RBE_PROD,
-      goma_enable_ats = True,
       mastername = 'chromium.win',
       os = os,
       **kwargs

infra/config/buckets/try.star

@@ -365,25 +365,21 @@ angle_builder(
 
 angle_builder(
     name = 'win-angle-deqp-rel-32',
-    goma_enable_ats = True,
     os = os.WINDOWS_ANY,
 )
 
 angle_builder(
     name = 'win-angle-deqp-rel-64',
-    goma_enable_ats = True,
     os = os.WINDOWS_ANY,
 )
 
 angle_builder(
     name = 'win-angle-rel-32',
-    goma_enable_ats = True,
     os = os.WINDOWS_ANY,
 )
 
 angle_builder(
     name = 'win-angle-rel-64',
-    goma_enable_ats = True,
     os = os.WINDOWS_ANY,
 )
 
@@ -412,7 +408,6 @@ blink_builder(
 blink_builder(
     name = 'win10-blink-rel',
     goma_backend = goma.backend.RBE_PROD,
-    goma_enable_ats = True,
     os = os.WINDOWS_ANY,
     builderless = True,
 )
@@ -420,7 +415,6 @@ blink_builder(
 blink_builder(
     name = 'win7-blink-rel',
     goma_backend = goma.backend.RBE_PROD,
-    goma_enable_ats = True,
     os = os.WINDOWS_ANY,
     builderless = True,
 )
@@ -601,7 +595,6 @@ dawn_builder(
 
 dawn_builder(
     name = 'dawn-win10-x64-deps-rel',
-    goma_enable_ats = True,
     os = os.WINDOWS_ANY,
     tryjob = tryjob(
         location_regexp = [
@@ -618,7 +611,6 @@ dawn_builder(
 
 dawn_builder(
     name = 'dawn-win10-x86-deps-rel',
-    goma_enable_ats = True,
     os = os.WINDOWS_ANY,
     tryjob = tryjob(
         location_regexp = [
@@ -644,7 +636,6 @@ dawn_builder(
 
 dawn_builder(
     name = 'win-dawn-rel',
-    goma_enable_ats = True,
     os = os.WINDOWS_ANY,
 )
 
@@ -864,7 +855,6 @@ def gpu_win_builder(*, name, os=os.WINDOWS_ANY, **kwargs):
   return gpu_builder(
       name = name,
       goma_backend = goma.backend.RBE_PROD,
-      goma_enable_ats = True,
       mastername = 'tryserver.chromium.win',
       os = os,
       **kwargs
@@ -1494,7 +1484,6 @@ def swangle_windows_builder(*, name, **kwargs):
       name = name,
       os = os.WINDOWS_DEFAULT,
       goma_backend = goma.backend.RBE_PROD,
-      goma_enable_ats = True,
       **kwargs
   )
 
@@ -1528,14 +1517,12 @@ def win_builder(
     name,
     builderless=True,
     goma_backend=goma.backend.RBE_PROD,
-    goma_enable_ats=True,
     os=os.WINDOWS_DEFAULT,
     **kwargs):
   return try_builder(
       name = name,
       builderless = builderless,
       goma_backend = goma_backend,
-      goma_enable_ats = goma_enable_ats,
       mastername = 'tryserver.chromium.win',
       os = os,
       **kwargs
@@ -1626,7 +1613,6 @@ win_builder(
     cores = 32,
     executable = luci.recipe(name = 'chromium_upload_clang'),
     goma_backend = None,
-    goma_enable_ats = False,
     os = os.WINDOWS_ANY,
 )
 

infra/config/generated/cr-buildbucket.cfg

@@ -7766,7 +7766,7 @@ buckets: <
         name: "celab"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "exclude:\"chrome_only\""
         properties_j: "mastername:\"chromium.fyi\""
@@ -7785,6 +7785,7 @@ buckets: <
       dimensions: "builder:win-pixel-builder-rel"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
       recipe: <
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"

infra/config/lib/builders.star

@@ -144,26 +144,30 @@ def _chromium_tests_property(*, bucketed_triggers):
   return chromium_tests or None
 
 
-def _goma_property(*, goma_backend, goma_debug, goma_enable_ats, goma_jobs):
-  goma = {}
+def _goma_property(*, goma_backend, goma_debug, goma_enable_ats, goma_jobs, os):
+  goma_properties = {}
 
   goma_backend = _default('goma_backend', goma_backend)
   if goma_backend != None:
-    goma.update(goma_backend)
+    goma_properties.update(goma_backend)
 
   goma_debug = _default('goma_debug', goma_debug)
   if goma_debug:
-    goma['debug'] = True
+    goma_properties['debug'] = True
 
   goma_enable_ats = _default('goma_enable_ats', goma_enable_ats)
-  if goma_enable_ats:
-    goma['enable_ats'] = True
+  if goma_enable_ats:  # TODO(crbug.com/1040754): Remove this flag.
+    goma_properties['enable_ats'] = True
+  elif (goma_backend in (goma.backend.RBE_TOT, goma.backend.RBE_STAGING,
+                         goma.backend.RBE_PROD) and
+        (os and os.category == os_category.WINDOWS)):
+    goma_properties['enable_ats'] = True
 
   goma_jobs = _default('goma_jobs', goma_jobs)
   if goma_jobs != None:
-    goma['jobs'] = goma_jobs
+    goma_properties['jobs'] = goma_jobs
 
-  return goma or None
+  return goma_properties or None
 
 
 def _code_coverage_property(*, use_clang_coverage, use_java_coverage):
@@ -385,6 +389,7 @@ def builder(
       goma_debug = goma_debug,
       goma_enable_ats = goma_enable_ats,
       goma_jobs = goma_jobs,
+      os = os,
   )
   if goma != None:
     properties['$build/goma'] = goma

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

@@ -142,7 +142,6 @@ gpu_builder(
 gpu_builder(
     name = 'GPU Win x64 Builder',
     builderless = True,
-    goma_enable_ats = True,
     os = os.WINDOWS_ANY,
 )
 
@@ -257,7 +256,6 @@ def win_builder(*, name, os=os.WINDOWS_DEFAULT, **kwargs):
   return builder(
       name = name,
       goma_backend = goma.backend.RBE_PROD,
-      goma_enable_ats = True,
       mastername = 'chromium.win',
       os = os,
       **kwargs

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

@@ -262,7 +262,6 @@ def win_builder(*, name, builderless=True, os=os.WINDOWS_DEFAULT, **kwargs):
       name = name,
       builderless = builderless,
       goma_backend = goma.backend.RBE_PROD,
-      goma_enable_ats = True,
       mastername = 'tryserver.chromium.win',
       os = os,
       **kwargs

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

@@ -142,7 +142,6 @@ gpu_builder(
 gpu_builder(
     name = 'GPU Win x64 Builder',
     builderless = True,
-    goma_enable_ats = True,
     os = os.WINDOWS_ANY,
 )
 
@@ -257,7 +256,6 @@ def win_builder(*, name, os=os.WINDOWS_DEFAULT, **kwargs):
   return builder(
       name = name,
       goma_backend = goma.backend.RBE_PROD,
-      goma_enable_ats = True,
       mastername = 'chromium.win',
       os = os,
       **kwargs

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

@@ -239,7 +239,6 @@ def win_builder(*, name, builderless=True, os=os.WINDOWS_DEFAULT, **kwargs):
       name = name,
       builderless = builderless,
       goma_backend = goma.backend.RBE_PROD,
-      goma_enable_ats = True,
       mastername = 'tryserver.chromium.win',
       os = os,
       **kwargs

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

@@ -142,7 +142,6 @@ gpu_builder(
 gpu_builder(
     name = 'GPU Win x64 Builder',
     builderless = True,
-    goma_enable_ats = True,
     os = os.WINDOWS_ANY,
 )
 
@@ -257,7 +256,6 @@ def win_builder(*, name, os=os.WINDOWS_DEFAULT, **kwargs):
   return builder(
       name = name,
       goma_backend = goma.backend.RBE_PROD,
-      goma_enable_ats = True,
       mastername = 'chromium.win',
       os = os,
       **kwargs

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

@@ -239,7 +239,6 @@ def win_builder(*, name, builderless=True, os=os.WINDOWS_DEFAULT, **kwargs):
       name = name,
       builderless = builderless,
       goma_backend = goma.backend.RBE_PROD,
-      goma_enable_ats = True,
       mastername = 'tryserver.chromium.win',
       os = os,
       **kwargs