From ef7618a8f97aa48da34eb9b29b1791a5e7d350ab Mon Sep 17 00:00:00 2001
From: Jeremy Leconte <jleconte@google.com>
Date: Tue, 29 Nov 2022 11:02:06 +0100
Subject: [PATCH] Run Android perf testers on more performant bots.

Change-Id: I412d83beed78d887a974bf1d52c98814456b749f
Bug: b/260684409
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/285441
Reviewed-by: Christoffer Jansson <jansson@webrtc.org>
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Cr-Commit-Position: refs/heads/main@{#38754}
---
 infra/config/config.star        | 6 +++++-
 infra/config/cr-buildbucket.cfg | 7 +++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/infra/config/config.star b/infra/config/config.star
index 9ce4943ec3..7fb71945e3 100755
--- a/infra/config/config.star
+++ b/infra/config/config.star
@@ -628,9 +628,13 @@ def perf_builder(name, perf_cat, **kwargs):
     properties = make_goma_properties()
     properties.update(make_reclient_properties("rbe-webrtc-trusted"))
     properties["builder_group"] = "client.webrtc.perf"
+    dimensions = {"pool": "luci.webrtc.perf", "os": "Linux"}
+    if "Android" in name:
+        # Android perf testers require more performant bots to finish under 3 hours.
+        dimensions["cores"] = "8"
     return webrtc_builder(
         name = name,
-        dimensions = {"pool": "luci.webrtc.perf", "os": "Linux"},
+        dimensions = dimensions,
         properties = properties,
         bucket = "perf",
         service_account = "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com",
diff --git a/infra/config/cr-buildbucket.cfg b/infra/config/cr-buildbucket.cfg
index c949ed793f..10efd3f3f3 100644
--- a/infra/config/cr-buildbucket.cfg
+++ b/infra/config/cr-buildbucket.cfg
@@ -2489,6 +2489,7 @@ buckets {
       name: "Perf Android32 (M AOSP Nexus6)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cores:8"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.perf"
       exe {
@@ -2538,6 +2539,7 @@ buckets {
       name: "Perf Android32 (M Nexus5)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cores:8"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.perf"
       exe {
@@ -2587,6 +2589,7 @@ buckets {
       name: "Perf Android32 (O Pixel2)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cores:8"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.perf"
       exe {
@@ -2636,6 +2639,7 @@ 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 {
@@ -2685,6 +2689,7 @@ buckets {
       name: "Perf Android64 (M Nexus5X)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cores:8"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.perf"
       exe {
@@ -2734,6 +2739,7 @@ buckets {
       name: "Perf Android64 (O Pixel2)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cores:8"
       dimensions: "os:Linux"
       dimensions: "pool:luci.webrtc.perf"
       exe {
@@ -2783,6 +2789,7 @@ 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 {