Move the rest of M106 orchestrator builders off of robocrop bots
Bug: 1372179
Change-Id: I53bddc9fd4e6d9692e1c1a9a3451f3b2fc4915bd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3965613
Commit-Queue: Stephanie Kim <[email protected]>
Reviewed-by: Ben Pastene <[email protected]>
Cr-Commit-Position: refs/branch-heads/5249@{#853}
Cr-Branched-From: 4f7bea5de862aaa52e6bde5920755a9ef9db120b-refs/heads/main@{#1036826}
diff --git a/infra/config/generated/luci/cr-buildbucket.cfg b/infra/config/generated/luci/cr-buildbucket.cfg
index eeabb430..f557fe6 100644
--- a/infra/config/generated/luci/cr-buildbucket.cfg
+++ b/infra/config/generated/luci/cr-buildbucket.cfg
@@ -10780,10 +10780,11 @@
builders {
name: "chromeos-amd64-generic-rel"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "builderless:1"
dimensions: "cores:2"
dimensions: "cpu:x86-64"
dimensions: "os:Ubuntu-18.04"
- dimensions: "pool:luci.chromium.try.orchestrator"
+ dimensions: "pool:luci.chromium.try"
exe {
cipd_package: "infra/chromium/bootstrapper/${platform}"
cipd_version: "latest"
@@ -10820,10 +10821,6 @@
seconds: 120
}
caches {
- name: "unused_builder_cache"
- path: "builder"
- }
- caches {
name: "win_toolchain"
path: "win_toolchain"
}
@@ -12414,10 +12411,11 @@
builders {
name: "ios-simulator"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "builderless:1"
dimensions: "cores:2"
dimensions: "cpu:x86-64"
dimensions: "os:Ubuntu-18.04"
- dimensions: "pool:luci.chromium.try.orchestrator"
+ dimensions: "pool:luci.chromium.try"
exe {
cipd_package: "infra/chromium/bootstrapper/${platform}"
cipd_version: "latest"
@@ -12454,10 +12452,6 @@
seconds: 120
}
caches {
- name: "unused_builder_cache"
- path: "builder"
- }
- caches {
name: "win_toolchain"
path: "win_toolchain"
}
@@ -13352,10 +13346,11 @@
builders {
name: "linux-chromeos-rel"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "builderless:1"
dimensions: "cores:2"
dimensions: "cpu:x86-64"
dimensions: "os:Ubuntu-18.04"
- dimensions: "pool:luci.chromium.try.orchestrator"
+ dimensions: "pool:luci.chromium.try"
exe {
cipd_package: "infra/chromium/bootstrapper/${platform}"
cipd_version: "latest"
@@ -13392,10 +13387,6 @@
seconds: 120
}
caches {
- name: "unused_builder_cache"
- path: "builder"
- }
- caches {
name: "win_toolchain"
path: "win_toolchain"
}
@@ -15025,10 +15016,11 @@
builders {
name: "mac-rel"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "builderless:1"
dimensions: "cores:2"
dimensions: "cpu:x86-64"
dimensions: "os:Ubuntu-18.04"
- dimensions: "pool:luci.chromium.try.orchestrator"
+ dimensions: "pool:luci.chromium.try"
exe {
cipd_package: "infra/chromium/bootstrapper/${platform}"
cipd_version: "latest"
@@ -15065,10 +15057,6 @@
seconds: 120
}
caches {
- name: "unused_builder_cache"
- path: "builder"
- }
- caches {
name: "win_toolchain"
path: "win_toolchain"
}
@@ -15663,10 +15651,11 @@
builders {
name: "win10_chromium_x64_rel_ng"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "builderless:1"
dimensions: "cores:2"
dimensions: "cpu:x86-64"
dimensions: "os:Ubuntu-18.04"
- dimensions: "pool:luci.chromium.try.orchestrator"
+ dimensions: "pool:luci.chromium.try"
exe {
cipd_package: "infra/chromium/bootstrapper/${platform}"
cipd_version: "latest"
@@ -15703,10 +15692,6 @@
seconds: 120
}
caches {
- name: "unused_builder_cache"
- path: "builder"
- }
- caches {
name: "win_toolchain"
path: "win_toolchain"
}
diff --git a/infra/config/subprojects/chromium/try/tryserver.chromium.chromiumos.star b/infra/config/subprojects/chromium/try/tryserver.chromium.chromiumos.star
index d99f69a..4924a6c3 100644
--- a/infra/config/subprojects/chromium/try/tryserver.chromium.chromiumos.star
+++ b/infra/config/subprojects/chromium/try/tryserver.chromium.chromiumos.star
@@ -61,7 +61,9 @@
"remove_src_checkout_experiment": 100,
"enable_weetbix_queries": 100,
},
- use_orchestrator_pool = True,
+ # TODO(crbug.com/1372179): Use orchestrator pool once overloaded test pools
+ # are addressed
+ # use_orchestrator_pool = True,
)
try_.compilator_builder(
@@ -221,7 +223,9 @@
"remove_src_checkout_experiment": 100,
"enable_weetbix_queries": 100,
},
- use_orchestrator_pool = True,
+ # TODO(crbug.com/1372179): Use orchestrator pool once overloaded test pools
+ # are addressed
+ # use_orchestrator_pool = True,
)
try_.compilator_builder(
diff --git a/infra/config/subprojects/chromium/try/tryserver.chromium.mac.star b/infra/config/subprojects/chromium/try/tryserver.chromium.mac.star
index 36693733..8074f1f8 100644
--- a/infra/config/subprojects/chromium/try/tryserver.chromium.mac.star
+++ b/infra/config/subprojects/chromium/try/tryserver.chromium.mac.star
@@ -104,7 +104,9 @@
"remove_src_checkout_experiment": 100,
"enable_weetbix_queries": 100,
},
- use_orchestrator_pool = True,
+ # TODO(crbug.com/1372179): Use orchestrator pool once overloaded test pools
+ # are addressed
+ # use_orchestrator_pool = True,
)
try_.compilator_builder(
@@ -328,7 +330,9 @@
"weetbix.retry_weak_exonerations": 100,
"weetbix.enable_weetbix_exonerations": 100,
},
- use_orchestrator_pool = True,
+ # TODO(crbug.com/1372179): Use orchestrator pool once overloaded test pools
+ # are addressed
+ # use_orchestrator_pool = True,
)
try_.compilator_builder(
diff --git a/infra/config/subprojects/chromium/try/tryserver.chromium.win.star b/infra/config/subprojects/chromium/try/tryserver.chromium.win.star
index 05e4702..6929697f 100644
--- a/infra/config/subprojects/chromium/try/tryserver.chromium.win.star
+++ b/infra/config/subprojects/chromium/try/tryserver.chromium.win.star
@@ -187,7 +187,9 @@
"remove_src_checkout_experiment": 100,
"enable_weetbix_queries": 100,
},
- use_orchestrator_pool = True,
+ # TODO(crbug.com/1372179): Use orchestrator pool once overloaded test pools
+ # are addressed
+ # use_orchestrator_pool = True,
)
try_.compilator_builder(
