Allocate specific bots to compile Chromium.

Also remove the unused 'inside_docker' dimension.

Change-Id: I524709116b366f6c929949542ddb98d9e990b468
Bug: b/265906442
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/304181
Reviewed-by: Christoffer Jansson <jansson@webrtc.org>
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Cr-Commit-Position: refs/heads/main@{#39989}
diff --git a/infra/config/config.star b/infra/config/config.star
index 93c5703..e60edaf 100755
--- a/infra/config/config.star
+++ b/infra/config/config.star
@@ -526,6 +526,7 @@
         if ci_cat and not perf_cat:
             lkgr_builders.append(name)
     dimensions.update({"pool": "luci.webrtc.ci", "cpu": kwargs.pop("cpu", DEFAULT_CPU)})
+    dimensions["builderless"] = "1"
     properties = properties or {}
     properties = dict(properties)  # Avoid mutating the original dict.
     properties["builder_group"] = "client.webrtc"
@@ -552,6 +553,7 @@
         try_cat = True,
         cq = {},
         branch_cq = True,
+        builder = None,
         **kwargs):
     """Add a pre-submit builder.
 
@@ -562,12 +564,17 @@
       try_cat: boolean, whether to include this builder in the /try/ console. See also: `add_milo`.
       cq: None to exclude this from all commit queues, or a dict of kwargs for cq_tryjob_verifier.
       branch_cq: False to exclude this builder just from the release-branch CQ.
+      builder: builder to set in the dimensions, if None, builderless:1 is used.
       **kwargs: Pass on to webrtc_builder / luci.builder.
     Returns:
       A luci.builder.
     """
     add_milo(name, {"try": try_cat})
     dimensions.update({"pool": "luci.webrtc.try", "cpu": DEFAULT_CPU})
+    if builder != None:
+        dimensions["builder"] = builder
+    else:
+        dimensions["builderless"] = "1"
     properties = properties or {}
     properties["builder_group"] = "tryserver.webrtc"
     properties.update(make_reclient_properties("rbe-webrtc-untrusted"))
@@ -650,7 +657,7 @@
 # Mixins:
 
 linux_builder, linux_try_job = normal_builder_factory(
-    dimensions = {"os": "Linux", "inside_docker": "0"},
+    dimensions = {"os": "Linux"},
 )
 
 android_builder, android_try_job = normal_builder_factory(
@@ -665,10 +672,6 @@
     dimensions = {"os": "Mac"},
 )
 
-mac_chromium_try_job = normal_builder_factory(
-    dimensions = {"os": "Mac", "cores": "12"},
-)[1]
-
 ios_builder, ios_try_job = normal_builder_factory(
     dimensions = {"os": "Mac"},
     properties = {"xcode_build_version": WEBRTC_XCODE13},
@@ -678,6 +681,23 @@
     )],
 )
 
+linux_chromium_try_job = normal_builder_factory(
+    dimensions = {"os": "Linux"},
+    builder = "chromium-compile",
+)[1]
+android_chromium_try_job = normal_builder_factory(
+    dimensions = {"os": "Linux"},
+    builder = "chromium-compile",
+)[1]
+win_chromium_try_job = normal_builder_factory(
+    dimensions = {"os": "Windows"},
+    builder = "chromium-compile",
+)[1]
+mac_chromium_try_job = normal_builder_factory(
+    dimensions = {"os": "Mac"},
+    builder = "chromium-compile",
+)[1]
+
 # Actual builder configuration:
 
 android_builder("Android32 (dbg)", "Android|arm|dbg")
@@ -706,7 +726,7 @@
 android_try_job("android_compile_x86_rel")
 android_builder("Android32 (more configs)", "Android|arm|more")
 android_try_job("android_arm_more_configs")
-android_try_job("android_chromium_compile", recipe = "chromium_trybot", branch_cq = False)
+android_chromium_try_job("android_chromium_compile", recipe = "chromium_trybot", branch_cq = False)
 
 ios_builder("iOS64 Debug", "iOS|arm64|dbg")
 ios_try_job("ios_compile_arm64_dbg")
@@ -751,34 +771,31 @@
 linux_try_job("linux_libfuzzer_rel", recipe = "libfuzzer")
 linux_builder("Linux (more configs)", "Linux|x64|more")
 linux_try_job("linux_more_configs")
-linux_try_job("linux_chromium_compile", recipe = "chromium_trybot", branch_cq = False)
-linux_try_job("linux_chromium_compile_dbg", recipe = "chromium_trybot", branch_cq = False)
 linux_try_job("linux_coverage")
-linux_try_job("webrtc_linux_chromium", recipe = "chromium_trybot", cq = None, branch_cq = False)
+linux_chromium_try_job("webrtc_linux_chromium", recipe = "chromium_trybot", cq = None, branch_cq = False)
+linux_chromium_try_job("linux_chromium_compile", recipe = "chromium_trybot", branch_cq = False)
+linux_chromium_try_job("linux_chromium_compile_dbg", recipe = "chromium_trybot", branch_cq = False)
 
 linux_builder("Fuchsia Builder", ci_cat = None, perf_cat = "Fuchsia|x64|Builder|", prioritized = True)
 linux_builder("Fuchsia Release", "Fuchsia|x64|rel")
 linux_try_job("fuchsia_rel")
 perf_builder("Perf Fuchsia", "Fuchsia|x64|Tester|", triggered_by = ["Fuchsia Builder"])
-
 mac_builder("Mac64 Debug", "Mac|x64|dbg")
 mac_try_job("mac_dbg", cq = None)
 mac_try_job("mac_compile_dbg")
 mac_builder("Mac64 Release", "Mac|x64|rel")
-
 mac_try_job("mac_rel")
 mac_try_job("mac_compile_rel", cq = None)
 mac_builder("Mac64 Builder", ci_cat = None, perf_cat = "Mac|x64|Builder|")
 mac_builder("MacArm64 Builder", ci_cat = None, perf_cat = "Mac|arm64|Builder|")
 perf_builder("Perf Mac 11", "Mac|x64|Tester|11", triggered_by = ["Mac64 Builder"])
 perf_builder("Perf Mac M1 Arm64 12", "Mac|arm64|Tester|12", triggered_by = ["MacArm64 Builder"])
-
 mac_builder("Mac Asan", "Mac|x64|asan")
 mac_try_job("mac_asan")
-mac_chromium_try_job("mac_chromium_compile", recipe = "chromium_trybot", branch_cq = False)
 mac_builder("MacARM64 M1 Release", "Mac|arm64M1|rel", cpu = "arm64-64-Apple_M1")
 mac_try_job("mac_rel_m1")
 mac_try_job("mac_dbg_m1")
+mac_chromium_try_job("mac_chromium_compile", recipe = "chromium_trybot", branch_cq = False)
 
 win_builder("Win32 Debug (Clang)", "Win Clang|x86|dbg")
 win_try_job("win_x86_clang_dbg", cq = None)
@@ -798,8 +815,8 @@
 win_try_job("win_asan")
 win_builder("Win (more configs)", "Win Clang|x86|more")
 win_try_job("win_x86_more_configs")
-win_try_job("win_chromium_compile", recipe = "chromium_trybot", branch_cq = False)
-win_try_job("win_chromium_compile_dbg", recipe = "chromium_trybot", branch_cq = False)
+win_chromium_try_job("win_chromium_compile", recipe = "chromium_trybot", branch_cq = False)
+win_chromium_try_job("win_chromium_compile_dbg", recipe = "chromium_trybot", branch_cq = False)
 
 linux_try_job(
     "presubmit",
diff --git a/infra/config/cr-buildbucket.cfg b/infra/config/cr-buildbucket.cfg
index f4b37eb..cc1bde5 100644
--- a/infra/config/cr-buildbucket.cfg
+++ b/infra/config/cr-buildbucket.cfg
@@ -18,6 +18,7 @@
       name: "Android32"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.ci"
@@ -64,6 +65,7 @@
       name: "Android32 (dbg)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.ci"
@@ -110,6 +112,7 @@
       name: "Android32 (more configs)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.ci"
@@ -156,6 +159,7 @@
       name: "Android32 Builder x86"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.ci"
@@ -202,6 +206,7 @@
       name: "Android32 Builder x86 (dbg)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.ci"
@@ -248,6 +253,7 @@
       name: "Android64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.ci"
@@ -294,6 +300,7 @@
       name: "Android64 Builder x64 (dbg)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.ci"
@@ -340,8 +347,8 @@
       name: "Fuchsia Release"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.ci"
       exe {
@@ -387,8 +394,8 @@
       name: "Linux (more configs)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.ci"
       exe {
@@ -434,8 +441,8 @@
       name: "Linux Asan"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.ci"
       exe {
@@ -481,8 +488,8 @@
       name: "Linux MSan"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.ci"
       exe {
@@ -528,8 +535,8 @@
       name: "Linux Tsan v2"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.ci"
       exe {
@@ -575,8 +582,8 @@
       name: "Linux UBSan"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.ci"
       exe {
@@ -622,8 +629,8 @@
       name: "Linux UBSan vptr"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.ci"
       exe {
@@ -669,8 +676,8 @@
       name: "Linux32 Debug"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.ci"
       exe {
@@ -716,8 +723,8 @@
       name: "Linux32 Debug (ARM)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.ci"
       exe {
@@ -763,8 +770,8 @@
       name: "Linux32 Release"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.ci"
       exe {
@@ -810,8 +817,8 @@
       name: "Linux32 Release (ARM)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.ci"
       exe {
@@ -857,8 +864,8 @@
       name: "Linux64 Debug"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.ci"
       exe {
@@ -904,8 +911,8 @@
       name: "Linux64 Debug (ARM)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.ci"
       exe {
@@ -951,8 +958,8 @@
       name: "Linux64 Release"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.ci"
       exe {
@@ -998,8 +1005,8 @@
       name: "Linux64 Release (ARM)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.ci"
       exe {
@@ -1045,8 +1052,8 @@
       name: "Linux64 Release (Libfuzzer)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.ci"
       exe {
@@ -1092,6 +1099,7 @@
       name: "Mac Asan"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Mac"
       dimensions: "pool:luci.webrtc.ci"
@@ -1138,6 +1146,7 @@
       name: "Mac64 Debug"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Mac"
       dimensions: "pool:luci.webrtc.ci"
@@ -1184,6 +1193,7 @@
       name: "Mac64 Release"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Mac"
       dimensions: "pool:luci.webrtc.ci"
@@ -1230,6 +1240,7 @@
       name: "MacARM64 M1 Release"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:arm64-64-Apple_M1"
       dimensions: "os:Mac"
       dimensions: "pool:luci.webrtc.ci"
@@ -1276,6 +1287,7 @@
       name: "Win (more configs)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Windows"
       dimensions: "pool:luci.webrtc.ci"
@@ -1322,6 +1334,7 @@
       name: "Win32 Debug (Clang)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Windows"
       dimensions: "pool:luci.webrtc.ci"
@@ -1368,6 +1381,7 @@
       name: "Win32 Release (Clang)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Windows"
       dimensions: "pool:luci.webrtc.ci"
@@ -1414,6 +1428,7 @@
       name: "Win64 ASan"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Windows"
       dimensions: "pool:luci.webrtc.ci"
@@ -1460,6 +1475,7 @@
       name: "Win64 Debug (Clang)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Windows"
       dimensions: "pool:luci.webrtc.ci"
@@ -1506,6 +1522,7 @@
       name: "Win64 Release (Clang)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Windows"
       dimensions: "pool:luci.webrtc.ci"
@@ -1552,6 +1569,7 @@
       name: "iOS API Framework Builder"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Mac"
       dimensions: "pool:luci.webrtc.ci"
@@ -1603,6 +1621,7 @@
       name: "iOS Debug (simulator)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Mac"
       dimensions: "pool:luci.webrtc.ci"
@@ -1654,6 +1673,7 @@
       name: "iOS64 Debug"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Mac"
       dimensions: "pool:luci.webrtc.ci"
@@ -1705,6 +1725,7 @@
       name: "iOS64 Release"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Mac"
       dimensions: "pool:luci.webrtc.ci"
@@ -1983,6 +2004,7 @@
       name: "Android32 Builder arm"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.ci"
@@ -2029,6 +2051,7 @@
       name: "Android64 Builder arm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.ci"
@@ -2075,8 +2098,8 @@
       name: "Fuchsia Builder"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.ci"
       exe {
@@ -2122,8 +2145,8 @@
       name: "Linux64 Builder"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.ci"
       exe {
@@ -2169,6 +2192,7 @@
       name: "Mac64 Builder"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Mac"
       dimensions: "pool:luci.webrtc.ci"
@@ -2215,6 +2239,7 @@
       name: "MacArm64 Builder"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Mac"
       dimensions: "pool:luci.webrtc.ci"
@@ -2675,6 +2700,7 @@
       name: "Win64 Builder (Clang)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Windows"
       dimensions: "pool:luci.webrtc.ci"
@@ -2737,6 +2763,7 @@
       name: "android_arm64_dbg"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.try"
@@ -2783,6 +2810,7 @@
       name: "android_arm64_rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.try"
@@ -2829,6 +2857,7 @@
       name: "android_arm_dbg"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.try"
@@ -2875,6 +2904,7 @@
       name: "android_arm_more_configs"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.try"
@@ -2921,6 +2951,7 @@
       name: "android_arm_rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.try"
@@ -2967,6 +2998,7 @@
       name: "android_chromium_compile"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:chromium-compile"
       dimensions: "cpu:x86-64"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.try"
@@ -3013,6 +3045,7 @@
       name: "android_compile_arm64_dbg"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.try"
@@ -3059,6 +3092,7 @@
       name: "android_compile_arm64_rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.try"
@@ -3105,6 +3139,7 @@
       name: "android_compile_arm_dbg"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.try"
@@ -3151,6 +3186,7 @@
       name: "android_compile_arm_rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.try"
@@ -3197,6 +3233,7 @@
       name: "android_compile_x64_dbg"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.try"
@@ -3243,6 +3280,7 @@
       name: "android_compile_x64_rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.try"
@@ -3289,6 +3327,7 @@
       name: "android_compile_x86_dbg"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.try"
@@ -3335,6 +3374,7 @@
       name: "android_compile_x86_rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.try"
@@ -3381,8 +3421,8 @@
       name: "fuchsia_rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.try"
       exe {
@@ -3428,6 +3468,7 @@
       name: "ios_api_framework"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Mac"
       dimensions: "pool:luci.webrtc.try"
@@ -3479,6 +3520,7 @@
       name: "ios_compile_arm64_dbg"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Mac"
       dimensions: "pool:luci.webrtc.try"
@@ -3530,6 +3572,7 @@
       name: "ios_compile_arm64_rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Mac"
       dimensions: "pool:luci.webrtc.try"
@@ -3581,6 +3624,7 @@
       name: "ios_dbg_simulator"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Mac"
       dimensions: "pool:luci.webrtc.try"
@@ -3632,8 +3676,8 @@
       name: "linux_asan"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.try"
       exe {
@@ -3679,8 +3723,8 @@
       name: "linux_chromium_compile"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:chromium-compile"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.try"
       exe {
@@ -3726,8 +3770,8 @@
       name: "linux_chromium_compile_dbg"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:chromium-compile"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.try"
       exe {
@@ -3773,8 +3817,8 @@
       name: "linux_compile_arm64_dbg"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.try"
       exe {
@@ -3820,8 +3864,8 @@
       name: "linux_compile_arm64_rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.try"
       exe {
@@ -3867,8 +3911,8 @@
       name: "linux_compile_arm_dbg"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.try"
       exe {
@@ -3914,8 +3958,8 @@
       name: "linux_compile_arm_rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.try"
       exe {
@@ -3961,8 +4005,8 @@
       name: "linux_compile_dbg"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.try"
       exe {
@@ -4008,8 +4052,8 @@
       name: "linux_compile_rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.try"
       exe {
@@ -4055,8 +4099,8 @@
       name: "linux_coverage"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.try"
       exe {
@@ -4102,8 +4146,8 @@
       name: "linux_dbg"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.try"
       exe {
@@ -4149,8 +4193,8 @@
       name: "linux_libfuzzer_rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.try"
       exe {
@@ -4196,8 +4240,8 @@
       name: "linux_more_configs"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.try"
       exe {
@@ -4243,8 +4287,8 @@
       name: "linux_msan"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.try"
       exe {
@@ -4290,8 +4334,8 @@
       name: "linux_rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.try"
       exe {
@@ -4337,8 +4381,8 @@
       name: "linux_tsan2"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.try"
       exe {
@@ -4384,8 +4428,8 @@
       name: "linux_ubsan"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.try"
       exe {
@@ -4431,8 +4475,8 @@
       name: "linux_ubsan_vptr"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.try"
       exe {
@@ -4478,8 +4522,8 @@
       name: "linux_x86_dbg"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.try"
       exe {
@@ -4525,8 +4569,8 @@
       name: "linux_x86_rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.try"
       exe {
@@ -4572,6 +4616,7 @@
       name: "mac_asan"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Mac"
       dimensions: "pool:luci.webrtc.try"
@@ -4618,7 +4663,7 @@
       name: "mac_chromium_compile"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cores:12"
+      dimensions: "builder:chromium-compile"
       dimensions: "cpu:x86-64"
       dimensions: "os:Mac"
       dimensions: "pool:luci.webrtc.try"
@@ -4665,6 +4710,7 @@
       name: "mac_compile_dbg"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Mac"
       dimensions: "pool:luci.webrtc.try"
@@ -4711,6 +4757,7 @@
       name: "mac_compile_rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Mac"
       dimensions: "pool:luci.webrtc.try"
@@ -4757,6 +4804,7 @@
       name: "mac_dbg"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Mac"
       dimensions: "pool:luci.webrtc.try"
@@ -4803,6 +4851,7 @@
       name: "mac_dbg_m1"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Mac"
       dimensions: "pool:luci.webrtc.try"
@@ -4849,6 +4898,7 @@
       name: "mac_rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Mac"
       dimensions: "pool:luci.webrtc.try"
@@ -4895,6 +4945,7 @@
       name: "mac_rel_m1"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Mac"
       dimensions: "pool:luci.webrtc.try"
@@ -4941,8 +4992,8 @@
       name: "presubmit"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.try"
       exe {
@@ -4990,8 +5041,8 @@
       name: "webrtc_linux_chromium"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:chromium-compile"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.try"
       exe {
@@ -5037,6 +5088,7 @@
       name: "win_asan"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Windows"
       dimensions: "pool:luci.webrtc.try"
@@ -5083,6 +5135,7 @@
       name: "win_chromium_compile"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:chromium-compile"
       dimensions: "cpu:x86-64"
       dimensions: "os:Windows"
       dimensions: "pool:luci.webrtc.try"
@@ -5129,6 +5182,7 @@
       name: "win_chromium_compile_dbg"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:chromium-compile"
       dimensions: "cpu:x86-64"
       dimensions: "os:Windows"
       dimensions: "pool:luci.webrtc.try"
@@ -5175,6 +5229,7 @@
       name: "win_compile_x64_clang_dbg"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Windows"
       dimensions: "pool:luci.webrtc.try"
@@ -5221,6 +5276,7 @@
       name: "win_compile_x64_clang_rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Windows"
       dimensions: "pool:luci.webrtc.try"
@@ -5267,6 +5323,7 @@
       name: "win_compile_x86_clang_dbg"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Windows"
       dimensions: "pool:luci.webrtc.try"
@@ -5313,6 +5370,7 @@
       name: "win_compile_x86_clang_rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Windows"
       dimensions: "pool:luci.webrtc.try"
@@ -5359,6 +5417,7 @@
       name: "win_x64_clang_dbg"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Windows"
       dimensions: "pool:luci.webrtc.try"
@@ -5405,6 +5464,7 @@
       name: "win_x64_clang_rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Windows"
       dimensions: "pool:luci.webrtc.try"
@@ -5451,6 +5511,7 @@
       name: "win_x86_clang_dbg"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Windows"
       dimensions: "pool:luci.webrtc.try"
@@ -5497,6 +5558,7 @@
       name: "win_x86_clang_rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Windows"
       dimensions: "pool:luci.webrtc.try"
@@ -5543,6 +5605,7 @@
       name: "win_x86_more_configs"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
       dimensions: "os:Windows"
       dimensions: "pool:luci.webrtc.try"
diff --git a/infra/config/luci-milo.cfg b/infra/config/luci-milo.cfg
index bddcc43..191ad18 100644
--- a/infra/config/luci-milo.cfg
+++ b/infra/config/luci-milo.cfg
@@ -535,18 +535,18 @@
     name: "buildbucket/luci.webrtc.try/linux_more_configs"
   }
   builders {
-    name: "buildbucket/luci.webrtc.try/linux_chromium_compile"
-  }
-  builders {
-    name: "buildbucket/luci.webrtc.try/linux_chromium_compile_dbg"
-  }
-  builders {
     name: "buildbucket/luci.webrtc.try/linux_coverage"
   }
   builders {
     name: "buildbucket/luci.webrtc.try/webrtc_linux_chromium"
   }
   builders {
+    name: "buildbucket/luci.webrtc.try/linux_chromium_compile"
+  }
+  builders {
+    name: "buildbucket/luci.webrtc.try/linux_chromium_compile_dbg"
+  }
+  builders {
     name: "buildbucket/luci.webrtc.try/fuchsia_rel"
   }
   builders {
@@ -565,15 +565,15 @@
     name: "buildbucket/luci.webrtc.try/mac_asan"
   }
   builders {
-    name: "buildbucket/luci.webrtc.try/mac_chromium_compile"
-  }
-  builders {
     name: "buildbucket/luci.webrtc.try/mac_rel_m1"
   }
   builders {
     name: "buildbucket/luci.webrtc.try/mac_dbg_m1"
   }
   builders {
+    name: "buildbucket/luci.webrtc.try/mac_chromium_compile"
+  }
+  builders {
     name: "buildbucket/luci.webrtc.try/win_x86_clang_dbg"
   }
   builders {