aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--infra/bots/recipes/ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json10
-rw-r--r--infra/bots/recipes/ct_skps.expected/CT_DM_100k_SKPs.json10
-rw-r--r--infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs.json10
-rw-r--r--infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs_Trybot.json10
-rw-r--r--infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json10
-rw-r--r--infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json10
-rw-r--r--infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json10
-rw-r--r--infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json10
-rw-r--r--infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json10
-rw-r--r--infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json10
-rw-r--r--infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json10
-rw-r--r--infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json10
-rw-r--r--infra/bots/recipes/ct_skps.py6
13 files changed, 65 insertions, 61 deletions
diff --git a/infra/bots/recipes/ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json
index 78e89a365e..09fe3775d9 100644
--- a/infra/bots/recipes/ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json
+++ b/infra/bots/recipes/ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json
@@ -844,7 +844,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
@@ -912,7 +912,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
@@ -980,7 +980,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
@@ -1048,7 +1048,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
@@ -1116,7 +1116,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_100k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_DM_100k_SKPs.json
index 2bef9308d1..db7f576a8a 100644
--- a/infra/bots/recipes/ct_skps.expected/CT_DM_100k_SKPs.json
+++ b/infra/bots/recipes/ct_skps.expected/CT_DM_100k_SKPs.json
@@ -844,7 +844,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
@@ -912,7 +912,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
@@ -980,7 +980,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
@@ -1048,7 +1048,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
@@ -1116,7 +1116,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs.json
index 9726bf45a0..ce8a9bbeae 100644
--- a/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs.json
+++ b/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs.json
@@ -844,7 +844,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
@@ -912,7 +912,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
@@ -980,7 +980,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
@@ -1048,7 +1048,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
@@ -1116,7 +1116,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs_Trybot.json b/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs_Trybot.json
index 1b5f1c36ef..5a3d9636c4 100644
--- a/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs_Trybot.json
+++ b/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs_Trybot.json
@@ -848,7 +848,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
@@ -920,7 +920,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
@@ -992,7 +992,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
@@ -1064,7 +1064,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
@@ -1136,7 +1136,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json
index d9e6c0701f..edf0dc50c8 100644
--- a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json
+++ b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json
@@ -844,7 +844,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
@@ -912,7 +912,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
@@ -980,7 +980,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
@@ -1048,7 +1048,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
@@ -1116,7 +1116,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json
index 872a058a57..a7d61fcef8 100644
--- a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json
+++ b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json
@@ -844,7 +844,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
@@ -912,7 +912,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
@@ -980,7 +980,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
@@ -1048,7 +1048,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
@@ -1116,7 +1116,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json
index 15b059fad7..c2ce7ee027 100644
--- a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json
+++ b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json
@@ -844,7 +844,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
@@ -912,7 +912,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
@@ -980,7 +980,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
@@ -1048,7 +1048,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
@@ -1116,7 +1116,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
diff --git a/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json
index 24e26a9393..e24b5531c5 100644
--- a/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json
+++ b/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json
@@ -844,7 +844,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-E3-1230_v5",
"--dimension",
"gpu",
"10de:104a",
@@ -915,7 +915,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-E3-1230_v5",
"--dimension",
"gpu",
"10de:104a",
@@ -986,7 +986,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-E3-1230_v5",
"--dimension",
"gpu",
"10de:104a",
@@ -1057,7 +1057,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-E3-1230_v5",
"--dimension",
"gpu",
"10de:104a",
@@ -1128,7 +1128,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-E3-1230_v5",
"--dimension",
"gpu",
"10de:104a",
diff --git a/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json
index 1d84d0c5db..86c7e90def 100644
--- a/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json
+++ b/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json
@@ -844,7 +844,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-E3-1230_v5",
"--dimension",
"gpu",
"10de:104a",
@@ -915,7 +915,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-E3-1230_v5",
"--dimension",
"gpu",
"10de:104a",
@@ -986,7 +986,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-E3-1230_v5",
"--dimension",
"gpu",
"10de:104a",
@@ -1057,7 +1057,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-E3-1230_v5",
"--dimension",
"gpu",
"10de:104a",
@@ -1128,7 +1128,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-E3-1230_v5",
"--dimension",
"gpu",
"10de:104a",
diff --git a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json
index ff86054bf4..db9879a2fc 100644
--- a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json
+++ b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json
@@ -844,7 +844,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
@@ -912,7 +912,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
@@ -980,7 +980,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
@@ -1048,7 +1048,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
@@ -1116,7 +1116,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
diff --git a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json
index 13ad9bd799..849f5e73b7 100644
--- a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json
+++ b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json
@@ -844,7 +844,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
@@ -912,7 +912,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
@@ -980,7 +980,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
@@ -1048,7 +1048,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
@@ -1116,7 +1116,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
diff --git a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json
index ba63a3e8eb..9afdb75847 100644
--- a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json
+++ b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json
@@ -848,7 +848,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
@@ -922,7 +922,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
@@ -996,7 +996,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
@@ -1070,7 +1070,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
@@ -1144,7 +1144,7 @@
"14400",
"--dimension",
"cpu",
- "x86-64",
+ "x86-64-Broadwell_GCE",
"--dimension",
"os",
"Ubuntu-14.04",
diff --git a/infra/bots/recipes/ct_skps.py b/infra/bots/recipes/ct_skps.py
index 1dcbee1ddf..96d232c5df 100644
--- a/infra/bots/recipes/ct_skps.py
+++ b/infra/bots/recipes/ct_skps.py
@@ -199,11 +199,15 @@ def RunSteps(api):
tasks_to_swarm_hashes.sort()
# Trigger all swarming tasks.
- dimensions={'os': 'Ubuntu-14.04', 'cpu': 'x86-64', 'pool': 'Chrome'}
+ dimensions={'os': 'Ubuntu-14.04'}
if 'GPU' in buildername:
+ dimensions['cpu'] = 'x86-64-E3-1230_v5'
dimensions['gpu'] = '10de:104a'
# See crbug.com/700053
dimensions['pool'] = 'Chrome-GPU'
+ else:
+ dimensions['cpu'] = 'x86-64-Broadwell_GCE'
+ dimensions['pool'] = 'Chrome'
tasks = api.skia_swarming.trigger_swarming_tasks(
tasks_to_swarm_hashes, dimensions=dimensions, io_timeout=40*60)
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-11 08:31:26 +0000