Revert "Add branched versions of Phase B CI builders."

This reverts commit b46672aa. Reason for revert: crbug.com/1030521 Original change's description: > Add branched versions of Phase B CI builders. > > All branch CI builders have been moved to be scheduled once per day. As > we get capacity and get the builds into a good state, we will move them > to be continuously triggered. > > Bug: 1024641, 922150 > Change-Id: Ie066240907dd581175c94cbca431e5a6bf37deb3 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1948050 > Reviewed-by: Aaron Gable <agable@chromium.org> > Commit-Queue: Aaron Gable <agable@chromium.org> > Auto-Submit: Garrett Beaty <gbeaty@chromium.org> > Cr-Commit-Position: refs/heads/master@{#721218} TBR=agable@chromium.org,gbeaty@chromium.org Change-Id: I717e2f06feba96a3d3b64b89f92a4821b9368c00 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 1024641, 922150 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1951363Reviewed-by: Garrett Beaty <gbeaty@chromium.org> Commit-Queue: Garrett Beaty <gbeaty@chromium.org> Cr-Commit-Position: refs/heads/master@{#721595}

Revert "Add branched versions of Phase B CI builders."
This reverts commit b46672aa. Reason for revert: crbug.com/1030521 Original change's description: > Add branched versions of Phase B CI builders. > > All branch CI builders have been moved to be scheduled once per day. As > we get capacity and get the builds into a good state, we will move them > to be continuously triggered. > > Bug: 1024641, 922150 > Change-Id: Ie066240907dd581175c94cbca431e5a6bf37deb3 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1948050 > Reviewed-by: Aaron Gable <agable@chromium.org> > Commit-Queue: Aaron Gable <agable@chromium.org> > Auto-Submit: Garrett Beaty <gbeaty@chromium.org> > Cr-Commit-Position: refs/heads/master@{#721218} TBR=agable@chromium.org,gbeaty@chromium.org Change-Id: I717e2f06feba96a3d3b64b89f92a4821b9368c00 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 1024641, 922150 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1951363Reviewed-by: Garrett Beaty <gbeaty@chromium.org> Commit-Queue: Garrett Beaty <gbeaty@chromium.org> Cr-Commit-Position: refs/heads/master@{#721595}
be32a1db · Garrett Beaty · Commit Bot · 569f0c73 · be32a1db · be32a1db
Commit be32a1db authored Dec 04, 2019 by Garrett Beaty Committed by Commit Bot Dec 04, 2019
10 changed files
--- a/infra/config/buckets/ci.star
+++ b/infra/config/buckets/ci.star
@@ -452,6 +452,11 @@ chromiumos_builder(
    goma_enable_ats = True,
 )

+chromiumos_builder(
+    name = 'chromeos-amd64-generic-rel',
+    goma_enable_ats = True,
+)
+
 chromiumos_builder(
    name = 'chromeos-arm-generic-dbg',
    goma_enable_ats = True,
@@ -471,6 +476,10 @@ chromiumos_builder(
    name = 'linux-chromeos-dbg',
 )

+chromiumos_builder(
+    name = 'linux-chromeos-rel',
+)
+

 def clang_builder(*, name, cores=32, properties=None, **kwargs):
  properties = properties or {}
@@ -1803,6 +1812,13 @@ gpu_builder(
    goma_backend = goma.backend.RBE_PROD,
 )

+gpu_builder(
+    name = 'GPU Mac Builder',
+    cores = None,
+    goma_backend = goma.backend.RBE_PROD,
+    os = os.MAC_ANY,
+)
+
 gpu_builder(
    name = 'GPU Mac Builder (dbg)',
    cores = None,
@@ -1810,6 +1826,12 @@ gpu_builder(
    os = os.MAC_ANY,
 )

+gpu_builder(
+    name = 'GPU Win x64 Builder',
+    builderless = True,
+    os = os.WINDOWS_ANY,
+)
+
 gpu_builder(
    name = 'GPU Win x64 Builder (dbg)',
    builderless = True,
@@ -1835,14 +1857,26 @@ gpu_linux_ci_tester(
    name = 'Mac Debug (Intel)',
 )

+gpu_linux_ci_tester(
+    name = 'Mac Release (Intel)',
+)
+
 gpu_linux_ci_tester(
    name = 'Mac Retina Debug (AMD)',
 )

+gpu_linux_ci_tester(
+    name = 'Mac Retina Release (AMD)',
+)
+
 gpu_linux_ci_tester(
    name = 'Win10 x64 Debug (NVIDIA)',
 )

+gpu_linux_ci_tester(
+    name = 'Win10 x64 Release (NVIDIA)',
+)
+

 def linux_builder(
    *,
@@ -1966,6 +2000,10 @@ def mac_builder(
      **kwargs
  )

+mac_builder(
+    name = 'Mac Builder',
+)
+
 mac_builder(
    name = 'Mac Builder (dbg)',
    os = os.MAC_ANY,
@@ -1986,6 +2024,11 @@ mac_builder(
    os = os.MAC_10_12,
 )

+mac_builder(
+    name = 'Mac10.13 Tests',
+    os = os.MAC_10_13,
+)
+
 mac_builder(
    name = 'Mac10.13 Tests (dbg)',
    os = os.MAC_ANY,
@@ -2014,6 +2057,10 @@ mac_ios_builder(
    name = 'ios-device-xcode-clang',
 )

+mac_ios_builder(
+    name = 'ios-simulator',
+)
+
 mac_ios_builder(
    name = 'ios-simulator-full-configs',
 )
@@ -2261,12 +2308,22 @@ win_builder(
    os = os.WINDOWS_ANY,
 )

+win_builder(
+    name = 'Win x64 Builder',
+    cores = 32,
+    os = os.WINDOWS_ANY,
+)
+
 win_builder(
    name = 'Win x64 Builder (dbg)',
    cores = 32,
    os = os.WINDOWS_ANY,
 )

+win_builder(
+    name = 'Win10 Tests x64',
+)
+
 win_builder(
    name = 'Win10 Tests x64 (dbg)',
 )

--- a/infra/config/consoles/main-beta.star
+++ b/infra/config/consoles/main-beta.star
@@ -18,43 +18,9 @@ luci.console_view(
            category = 'chromium.linux|release',
            short_name = 'tst',
        ),
-        luci.console_view_entry(
-            builder = 'ci-beta/linux-chromeos-rel',
-            category = 'chromium.chromiumos|default',
-            short_name = 'rel',
-        ),
-        luci.console_view_entry(
-            builder = 'ci-beta/chromeos-amd64-generic-rel',
-            category = 'chromium.chromiumos|simple|release|x64',
-            short_name = 'rel',
-        ),
-        luci.console_view_entry(
-            builder = 'ci-beta/Mac Builder',
-            category = 'chromium.mac|release',
-            short_name = 'bld',
-        ),
-        luci.console_view_entry(
-            builder = 'ci-beta/Mac10.13 Tests',
-            category = 'chromium.mac|release',
-            short_name = '13',
-        ),
-        luci.console_view_entry(
-            builder = 'ci-beta/ios-simulator',
-            category = 'chromium.mac|ios|default',
-            short_name = 'sim',
-        ),
-        luci.console_view_entry(
-            builder = 'ci-beta/Win x64 Builder',
-            category = 'chromium.win|release|builder',
-            short_name = '64',
-        ),
-        luci.console_view_entry(
-            builder = 'ci-beta/Win10 Tests x64',
-            category = 'chromium.win|release|tester',
-            short_name = 'w10',
-        ),
-        # TODO(https://crbug.com/922150) Add the following builders to the main
-        # console or don't have them be mirrored by main waterfall trybots
+        # TODO(https://crbug.com/922150) Move these to an appropriate console
+        # and/or don't have linux-rel mirror these since they do not appear on
+        # the main console
        luci.console_view_entry(
            builder = 'ci-beta/android-kitkat-arm-rel',
            category = 'chromium.android',
@@ -77,25 +43,5 @@ luci.console_view(
            builder = 'ci-beta/Linux Release (NVIDIA)',
            category = 'chromium.gpu|linux',
        ),
-        luci.console_view_entry(
-            builder = 'ci-beta/GPU Mac Builder',
-            category = 'chromium.gpu|mac',
-        ),
-        luci.console_view_entry(
-            builder = 'ci-beta/Mac Release (Intel)',
-            category = 'chromium.gpu|mac',
-        ),
-        luci.console_view_entry(
-            builder = 'ci-beta/Mac Retina Release (AMD)',
-            category = 'chromium.gpu|mac',
-        ),
-        luci.console_view_entry(
-            builder = 'ci-beta/GPU Win x64 Builder',
-            category = 'chromium.gpu|win',
-        ),
-        luci.console_view_entry(
-            builder = 'ci-beta/Win10 x64 Release (NVIDIA)',
-            category = 'chromium.gpu|win',
-        ),
    ],
 )
--- a/infra/config/consoles/main-stable.star
+++ b/infra/config/consoles/main-stable.star
@@ -18,43 +18,9 @@ luci.console_view(
            category = 'chromium.linux|release',
            short_name = 'tst',
        ),
-        luci.console_view_entry(
-            builder = 'ci-stable/linux-chromeos-rel',
-            category = 'chromium.chromiumos|default',
-            short_name = 'rel',
-        ),
-        luci.console_view_entry(
-            builder = 'ci-stable/chromeos-amd64-generic-rel',
-            category = 'chromium.chromiumos|simple|release|x64',
-            short_name = 'rel',
-        ),
-        luci.console_view_entry(
-            builder = 'ci-stable/Mac Builder',
-            category = 'chromium.mac|release',
-            short_name = 'bld',
-        ),
-        luci.console_view_entry(
-            builder = 'ci-stable/Mac10.13 Tests',
-            category = 'chromium.mac|release',
-            short_name = '13',
-        ),
-        luci.console_view_entry(
-            builder = 'ci-stable/ios-simulator',
-            category = 'chromium.mac|ios|default',
-            short_name = 'sim',
-        ),
-        luci.console_view_entry(
-            builder = 'ci-stable/Win x64 Builder',
-            category = 'chromium.win|release|builder',
-            short_name = '64',
-        ),
-        luci.console_view_entry(
-            builder = 'ci-stable/Win10 Tests x64',
-            category = 'chromium.win|release|tester',
-            short_name = 'w10',
-        ),
-        # TODO(https://crbug.com/922150) Add the following builders to the main
-        # console or don't have them be mirrored by main waterfall trybots
+        # TODO(https://crbug.com/922150) Move these to an appropriate console
+        # and/or don't have linux-rel mirror these since they do not appear on
+        # the main console
        luci.console_view_entry(
            builder = 'ci-stable/android-kitkat-arm-rel',
            category = 'chromium.android',
@@ -77,25 +43,5 @@ luci.console_view(
            builder = 'ci-stable/Linux Release (NVIDIA)',
            category = 'chromium.gpu|linux',
        ),
-        luci.console_view_entry(
-            builder = 'ci-stable/GPU Mac Builder',
-            category = 'chromium.gpu|mac',
-        ),
-        luci.console_view_entry(
-            builder = 'ci-stable/Mac Release (Intel)',
-            category = 'chromium.gpu|mac',
-        ),
-        luci.console_view_entry(
-            builder = 'ci-stable/Mac Retina Release (AMD)',
-            category = 'chromium.gpu|mac',
-        ),
-        luci.console_view_entry(
-            builder = 'ci-stable/GPU Win x64 Builder',
-            category = 'chromium.gpu|win',
-        ),
-        luci.console_view_entry(
-            builder = 'ci-stable/Win10 x64 Release (NVIDIA)',
-            category = 'chromium.gpu|win',
-        ),
    ],
 )
--- a/infra/config/generated/cr-buildbucket.cfg
+++ b/infra/config/generated/cr-buildbucket.cfg
--- a/infra/config/generated/luci-milo.cfg
+++ b/infra/config/generated/luci-milo.cfg
@@ -10800,41 +10800,6 @@ consoles: <
    category: "chromium.linux|release"
    short_name: "tst"
  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci-beta/linux-chromeos-rel"
-    category: "chromium.chromiumos|default"
-    short_name: "rel"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci-beta/chromeos-amd64-generic-rel"
-    category: "chromium.chromiumos|simple|release|x64"
-    short_name: "rel"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci-beta/Mac Builder"
-    category: "chromium.mac|release"
-    short_name: "bld"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci-beta/Mac10.13 Tests"
-    category: "chromium.mac|release"
-    short_name: "13"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci-beta/ios-simulator"
-    category: "chromium.mac|ios|default"
-    short_name: "sim"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci-beta/Win x64 Builder"
-    category: "chromium.win|release|builder"
-    short_name: "64"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci-beta/Win10 Tests x64"
-    category: "chromium.win|release|tester"
-    short_name: "w10"
-  >
  builders: <
    name: "buildbucket/luci.chromium.ci-beta/android-kitkat-arm-rel"
    category: "chromium.android"
@@ -10857,26 +10822,6 @@ consoles: <
    name: "buildbucket/luci.chromium.ci-beta/Linux Release (NVIDIA)"
    category: "chromium.gpu|linux"
  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci-beta/GPU Mac Builder"
-    category: "chromium.gpu|mac"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci-beta/Mac Release (Intel)"
-    category: "chromium.gpu|mac"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci-beta/Mac Retina Release (AMD)"
-    category: "chromium.gpu|mac"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci-beta/GPU Win x64 Builder"
-    category: "chromium.gpu|win"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci-beta/Win10 x64 Release (NVIDIA)"
-    category: "chromium.gpu|win"
-  >
  header: <
    oncalls: <
      name: "Chromium"
@@ -11141,41 +11086,6 @@ consoles: <
    category: "chromium.linux|release"
    short_name: "tst"
  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci-stable/linux-chromeos-rel"
-    category: "chromium.chromiumos|default"
-    short_name: "rel"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci-stable/chromeos-amd64-generic-rel"
-    category: "chromium.chromiumos|simple|release|x64"
-    short_name: "rel"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci-stable/Mac Builder"
-    category: "chromium.mac|release"
-    short_name: "bld"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci-stable/Mac10.13 Tests"
-    category: "chromium.mac|release"
-    short_name: "13"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci-stable/ios-simulator"
-    category: "chromium.mac|ios|default"
-    short_name: "sim"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci-stable/Win x64 Builder"
-    category: "chromium.win|release|builder"
-    short_name: "64"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci-stable/Win10 Tests x64"
-    category: "chromium.win|release|tester"
-    short_name: "w10"
-  >
  builders: <
    name: "buildbucket/luci.chromium.ci-stable/android-kitkat-arm-rel"
    category: "chromium.android"
@@ -11198,26 +11108,6 @@ consoles: <
    name: "buildbucket/luci.chromium.ci-stable/Linux Release (NVIDIA)"
    category: "chromium.gpu|linux"
  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci-stable/GPU Mac Builder"
-    category: "chromium.gpu|mac"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci-stable/Mac Release (Intel)"
-    category: "chromium.gpu|mac"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci-stable/Mac Retina Release (AMD)"
-    category: "chromium.gpu|mac"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci-stable/GPU Win x64 Builder"
-    category: "chromium.gpu|win"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci-stable/Win10 x64 Release (NVIDIA)"
-    category: "chromium.gpu|win"
-  >
  header: <
    oncalls: <
      name: "Chromium"

--- a/infra/config/generated/luci-scheduler.cfg
+++ b/infra/config/generated/luci-scheduler.cfg
--- a/infra/config/luci-scheduler.cfg
+++ b/infra/config/luci-scheduler.cfg
--- a/infra/config/versioned/milestones/m78/buckets/ci.star
+++ b/infra/config/versioned/milestones/m78/buckets/ci.star
@@ -24,12 +24,6 @@ defaults.bucket.set(vars.bucket.get())
 defaults.bucketed_triggers.set(True)


-XCODE_IOS_11_CACHE = swarming.cache(
-    name = 'xcode_ios_11a1027',
-    path = 'xcode_ios_11a1027.app',
-)
-
-
 # Builders appear after the function used to define them, with all builders
 # defined using the same function ordered lexicographically by name
 # Builder functions are defined in lexicographic order by name ignoring the
@@ -66,24 +60,6 @@ android_builder(
 )


-def chromiumos_builder(*, name, **kwargs):
-  return builder(
-      name = name,
-      mastername = 'chromium.chromiumos',
-      goma_backend = goma.backend.RBE_PROD,
-      **kwargs
-  )
-
-chromiumos_builder(
-    name = 'chromeos-amd64-generic-rel',
-    goma_enable_ats = True,
-)
-
-chromiumos_builder(
-    name = 'linux-chromeos-rel',
-)
-
-
 def gpu_builder(*, name, **kwargs):
  return builder(
      name = name,
@@ -101,19 +77,6 @@ gpu_builder(
    goma_backend = goma.backend.RBE_PROD,
 )

-gpu_builder(
-    name = 'GPU Mac Builder',
-    cores = None,
-    goma_backend = goma.backend.RBE_PROD,
-    os = os.MAC_ANY,
-)
-
-gpu_builder(
-    name = 'GPU Win x64 Builder',
-    builderless = True,
-    os = os.WINDOWS_ANY,
-)
-

 # Many of the GPU testers are thin testers, they use linux VMS regardless of the
 # actual OS that the tests are built for
@@ -129,18 +92,6 @@ gpu_linux_ci_tester(
    name = 'Linux Release (NVIDIA)',
 )

-gpu_linux_ci_tester(
-    name = 'Mac Release (Intel)',
-)
-
-gpu_linux_ci_tester(
-    name = 'Mac Retina Release (AMD)',
-)
-
-gpu_linux_ci_tester(
-    name = 'Win10 x64 Release (NVIDIA)',
-)
-

 def linux_builder(*, name, goma_jobs = goma.jobs.MANY_JOBS_FOR_CI, **kwargs):
  return builder(
@@ -158,63 +109,3 @@ linux_builder(
 linux_builder(
    name = 'Linux Tests',
 )
-
-
-def mac_builder(
-    *,
-    name,
-    cores=None,
-    goma_backend = goma.backend.RBE_PROD,
-    os=os.MAC_DEFAULT,
-    **kwargs):
-  return builder(
-      name = name,
-      cores = cores,
-      goma_backend = goma_backend,
-      mastername = 'chromium.mac',
-      os = os,
-      **kwargs
-  )
-
-mac_builder(
-    name = 'Mac Builder',
-)
-
-mac_builder(
-    name = 'Mac10.13 Tests',
-    os = os.MAC_10_13,
-)
-
-
-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',
-)
-
-
-def win_builder(*, name, os=os.WINDOWS_DEFAULT, **kwargs):
-  return builder(
-      name = name,
-      mastername = 'chromium.win',
-      os = os,
-      **kwargs
-  )
-
-win_builder(
-    name = 'Win x64 Builder',
-    cores = 32,
-    os = os.WINDOWS_ANY,
-)
-
-win_builder(
-    name = 'Win10 Tests x64',
-)
--- a/infra/config/versioned/milestones/m79/buckets/ci.star
+++ b/infra/config/versioned/milestones/m79/buckets/ci.star
@@ -24,12 +24,6 @@ defaults.bucket.set(vars.bucket.get())
 defaults.bucketed_triggers.set(True)


-XCODE_IOS_11_CACHE = swarming.cache(
-    name = 'xcode_ios_11a1027',
-    path = 'xcode_ios_11a1027.app',
-)
-
-
 # Builders appear after the function used to define them, with all builders
 # defined using the same function ordered lexicographically by name
 # Builder functions are defined in lexicographic order by name ignoring the
@@ -66,24 +60,6 @@ android_builder(
 )


-def chromiumos_builder(*, name, **kwargs):
-  return builder(
-      name = name,
-      mastername = 'chromium.chromiumos',
-      goma_backend = goma.backend.RBE_PROD,
-      **kwargs
-  )
-
-chromiumos_builder(
-    name = 'chromeos-amd64-generic-rel',
-    goma_enable_ats = True,
-)
-
-chromiumos_builder(
-    name = 'linux-chromeos-rel',
-)
-
-
 def gpu_builder(*, name, **kwargs):
  return builder(
      name = name,
@@ -101,19 +77,6 @@ gpu_builder(
    goma_backend = goma.backend.RBE_PROD,
 )

-gpu_builder(
-    name = 'GPU Mac Builder',
-    cores = None,
-    goma_backend = goma.backend.RBE_PROD,
-    os = os.MAC_ANY,
-)
-
-gpu_builder(
-    name = 'GPU Win x64 Builder',
-    builderless = True,
-    os = os.WINDOWS_ANY,
-)
-

 # Many of the GPU testers are thin testers, they use linux VMS regardless of the
 # actual OS that the tests are built for
@@ -129,18 +92,6 @@ gpu_linux_ci_tester(
    name = 'Linux Release (NVIDIA)',
 )

-gpu_linux_ci_tester(
-    name = 'Mac Release (Intel)',
-)
-
-gpu_linux_ci_tester(
-    name = 'Mac Retina Release (AMD)',
-)
-
-gpu_linux_ci_tester(
-    name = 'Win10 x64 Release (NVIDIA)',
-)
-

 def linux_builder(*, name, goma_jobs = goma.jobs.MANY_JOBS_FOR_CI, **kwargs):
  return builder(
@@ -158,63 +109,3 @@ linux_builder(
 linux_builder(
    name = 'Linux Tests',
 )
-
-
-def mac_builder(
-    *,
-    name,
-    cores=None,
-    goma_backend = goma.backend.RBE_PROD,
-    os=os.MAC_DEFAULT,
-    **kwargs):
-  return builder(
-      name = name,
-      cores = cores,
-      goma_backend = goma_backend,
-      mastername = 'chromium.mac',
-      os = os,
-      **kwargs
-  )
-
-mac_builder(
-    name = 'Mac Builder',
-)
-
-mac_builder(
-    name = 'Mac10.13 Tests',
-    os = os.MAC_10_13,
-)
-
-
-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',
-)
-
-
-def win_builder(*, name, os=os.WINDOWS_DEFAULT, **kwargs):
-  return builder(
-      name = name,
-      mastername = 'chromium.win',
-      os = os,
-      **kwargs
-  )
-
-win_builder(
-    name = 'Win x64 Builder',
-    cores = 32,
-    os = os.WINDOWS_ANY,
-)
-
-win_builder(
-    name = 'Win10 Tests x64',
-)
--- a/infra/config/versioned/trunk/buckets/ci.star
+++ b/infra/config/versioned/trunk/buckets/ci.star
@@ -24,22 +24,6 @@ defaults.bucket.set(vars.bucket.get())
 defaults.bucketed_triggers.set(True)


-XCODE_IOS_11_CACHE = swarming.cache(
-    name = 'xcode_ios_11a1027',
-    path = 'xcode_ios_11a1027.app',
-)
-
-
-# Builders appear after the function used to define them, with all builders
-# defined using the same function ordered lexicographically by name
-# Builder functions are defined in lexicographic order by name ignoring the
-# '_builder' suffix
-
-# Builder functions are defined for each master, with additional functions
-# for specializing on OS or particular configuration (e.g. builders running
-# libfuzzer recipe): XXX_builder and XXX_YYY_builder where XXX is the part after
-# the last dot in the mastername and YYY is the OS or configuration
-
 def android_builder(
    *,
    name,
@@ -66,24 +50,6 @@ android_builder(
 )


-def chromiumos_builder(*, name, **kwargs):
-  return builder(
-      name = name,
-      mastername = 'chromium.chromiumos',
-      goma_backend = goma.backend.RBE_PROD,
-      **kwargs
-  )
-
-chromiumos_builder(
-    name = 'chromeos-amd64-generic-rel',
-    goma_enable_ats = True,
-)
-
-chromiumos_builder(
-    name = 'linux-chromeos-rel',
-)
-
-
 def gpu_builder(*, name, **kwargs):
  return builder(
      name = name,
@@ -101,19 +67,6 @@ gpu_builder(
    goma_backend = goma.backend.RBE_PROD,
 )

-gpu_builder(
-    name = 'GPU Mac Builder',
-    cores = None,
-    goma_backend = goma.backend.RBE_PROD,
-    os = os.MAC_ANY,
-)
-
-gpu_builder(
-    name = 'GPU Win x64 Builder',
-    builderless = True,
-    os = os.WINDOWS_ANY,
-)
-

 # Many of the GPU testers are thin testers, they use linux VMS regardless of the
 # actual OS that the tests are built for
@@ -129,18 +82,6 @@ gpu_linux_ci_tester(
    name = 'Linux Release (NVIDIA)',
 )

-gpu_linux_ci_tester(
-    name = 'Mac Release (Intel)',
-)
-
-gpu_linux_ci_tester(
-    name = 'Mac Retina Release (AMD)',
-)
-
-gpu_linux_ci_tester(
-    name = 'Win10 x64 Release (NVIDIA)',
-)
-

 def linux_builder(*, name, goma_jobs = goma.jobs.MANY_JOBS_FOR_CI, **kwargs):
  return builder(
@@ -158,63 +99,3 @@ linux_builder(
 linux_builder(
    name = 'Linux Tests',
 )
-
-
-def mac_builder(
-    *,
-    name,
-    cores=None,
-    goma_backend = goma.backend.RBE_PROD,
-    os=os.MAC_DEFAULT,
-    **kwargs):
-  return builder(
-      name = name,
-      cores = cores,
-      goma_backend = goma_backend,
-      mastername = 'chromium.mac',
-      os = os,
-      **kwargs
-  )
-
-mac_builder(
-    name = 'Mac Builder',
-)
-
-mac_builder(
-    name = 'Mac10.13 Tests',
-    os = os.MAC_10_13,
-)
-
-
-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',
-)
-
-
-def win_builder(*, name, os=os.WINDOWS_DEFAULT, **kwargs):
-  return builder(
-      name = name,
-      mastername = 'chromium.win',
-      os = os,
-      **kwargs
-  )
-
-win_builder(
-    name = 'Win x64 Builder',
-    cores = 32,
-    os = os.WINDOWS_ANY,
-)
-
-win_builder(
-    name = 'Win10 Tests x64',
-)