From b2c4f5469c71b506e838189c8224cad7e75806b0 Mon Sep 17 00:00:00 2001
From: Christoffer Dewerin <jansson@google.com>
Date: Wed, 12 Jun 2024 09:04:14 +0200
Subject: [PATCH] Remove cores dimensions for perf bots

Bug: b/346481222
Change-Id: Iebc3aa98efc64ed75256df8ee7cffd30eee24239
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/354462
Reviewed-by: Jeremy Leconte <jleconte@webrtc.org>
Commit-Queue: Christoffer Dewerin <jansson@google.com>
Cr-Commit-Position: refs/heads/main@{#42467}
---
 infra/config/config.star        | 6 +-----
 infra/config/cr-buildbucket.cfg | 7 -------
 infra/config/project.cfg        | 2 +-
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/infra/config/config.star b/infra/config/config.star
index c070fa4074..315d437dab 100755
--- a/infra/config/config.star
+++ b/infra/config/config.star
@@ -634,11 +634,7 @@ def perf_builder(name, perf_cat, **kwargs):
     add_milo(name, {"perf": perf_cat})
     properties = make_reclient_properties("rbe-webrtc-trusted")
     properties["builder_group"] = "client.webrtc.perf"
-    dimensions = {"pool": "luci.webrtc.perf", "os": "Linux", "cores": "2"}
-    if "Android" in name or "Fuchsia" in name:
-        # Android perf testers require more performant bots to finish under 3 hours.
-        # Fuchsia perf testers encountered "no space left on device" error on multiple runs.
-        dimensions["cores"] = "8"
+    dimensions = {"pool": "luci.webrtc.perf", "os": "Linux"}
     return webrtc_builder(
         name = name,
         dimensions = dimensions,
diff --git a/infra/config/cr-buildbucket.cfg b/infra/config/cr-buildbucket.cfg
index 039c580a34..d49aeff5ec 100644
--- a/infra/config/cr-buildbucket.cfg
+++ b/infra/config/cr-buildbucket.cfg
@@ -2281,7 +2281,6 @@ buckets {
       name: "Perf Android32 (R Pixel5)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cores:8"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.perf"
       exe {
@@ -2327,7 +2326,6 @@ buckets {
       name: "Perf Android64 (R Pixel5)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cores:8"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.perf"
       exe {
@@ -2373,7 +2371,6 @@ buckets {
       name: "Perf Fuchsia"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cores:8"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.perf"
       exe {
@@ -2419,7 +2416,6 @@ buckets {
       name: "Perf Linux Bionic"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cores:2"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.perf"
       exe {
@@ -2465,7 +2461,6 @@ buckets {
       name: "Perf Mac 11"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cores:2"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.perf"
       exe {
@@ -2511,7 +2506,6 @@ buckets {
       name: "Perf Mac M1 Arm64 12"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cores:2"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.perf"
       exe {
@@ -2557,7 +2551,6 @@ buckets {
       name: "Perf Win 10"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cores:2"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.perf"
       exe {
diff --git a/infra/config/project.cfg b/infra/config/project.cfg
index fb19e5782c..f0e9a71ed3 100644
--- a/infra/config/project.cfg
+++ b/infra/config/project.cfg
@@ -7,7 +7,7 @@
 name: "webrtc"
 access: "group:all"
 lucicfg {
-  version: "1.43.5"
+  version: "1.43.6"
   package_dir: "."
   config_dir: "."
   entry_point: "config.star"