aboutsummaryrefslogtreecommitdiffhomepage
path: root/infra
diff options
context:
space:
mode:
authorGravatar Eric Boren <borenet@google.com>2017-03-06 09:06:53 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-03-06 14:39:35 +0000
commite395b9b879a941bba01d4ccc33c3d4cdfb4e8bef (patch)
treeee25b7589c54c93ca39e5285d0dd8a6a7da96c9b /infra
parent5128bd4b184b4572321821ad14def1a910159d6b (diff)
Roll Recipe DEPS
Just one commit: 97ab90f Reland "Make Ubuntu-14.04 the default version of Linux used when triggering Swarming tasks" BUG=skia: Change-Id: Ie9f37a1d1bb8326cf34123765618221b1460d6ea Reviewed-on: https://skia-review.googlesource.com/9290 Reviewed-by: Eric Boren <borenet@google.com> Commit-Queue: Eric Boren <borenet@google.com>
Diffstat (limited to 'infra')
-rw-r--r--infra/bots/recipes/swarm_ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json30
-rw-r--r--infra/bots/recipes/swarm_ct_skps.expected/CT_DM_100k_SKPs.json30
-rw-r--r--infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs.json30
-rw-r--r--infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs_Trybot.json30
-rw-r--r--infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json30
-rw-r--r--infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json32
-rw-r--r--infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json32
-rw-r--r--infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json30
-rw-r--r--infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json30
-rw-r--r--infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json30
-rw-r--r--infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json30
-rw-r--r--infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json30
-rw-r--r--infra/bots/recipes/swarm_ct_skps.py6
-rw-r--r--infra/config/recipes.cfg2
14 files changed, 186 insertions, 186 deletions
diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json
index 0fa631e2fe..be2081e6e5 100644
--- a/infra/bots/recipes/swarm_ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json
+++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json
@@ -906,10 +906,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-nanobench-1 on Ubuntu-14.04",
+ "stepname:ct-nanobench-1",
"[dummy hash for ct-nanobench-1]"
],
- "name": "[trigger] ct-nanobench-1 on Ubuntu-14.04",
+ "name": "[trigger] ct-nanobench-1",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -976,10 +976,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-nanobench-2 on Ubuntu-14.04",
+ "stepname:ct-nanobench-2",
"[dummy hash for ct-nanobench-2]"
],
- "name": "[trigger] ct-nanobench-2 on Ubuntu-14.04",
+ "name": "[trigger] ct-nanobench-2",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1046,10 +1046,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-nanobench-3 on Ubuntu-14.04",
+ "stepname:ct-nanobench-3",
"[dummy hash for ct-nanobench-3]"
],
- "name": "[trigger] ct-nanobench-3 on Ubuntu-14.04",
+ "name": "[trigger] ct-nanobench-3",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1116,10 +1116,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-nanobench-4 on Ubuntu-14.04",
+ "stepname:ct-nanobench-4",
"[dummy hash for ct-nanobench-4]"
],
- "name": "[trigger] ct-nanobench-4 on Ubuntu-14.04",
+ "name": "[trigger] ct-nanobench-4",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1186,10 +1186,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-nanobench-5 on Ubuntu-14.04",
+ "stepname:ct-nanobench-5",
"[dummy hash for ct-nanobench-5]"
],
- "name": "[trigger] ct-nanobench-5 on Ubuntu-14.04",
+ "name": "[trigger] ct-nanobench-5",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1224,7 +1224,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1"
],
- "name": "ct-nanobench-1 on Ubuntu-14.04",
+ "name": "ct-nanobench-1",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1353,7 +1353,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2"
],
- "name": "ct-nanobench-2 on Ubuntu-14.04",
+ "name": "ct-nanobench-2",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1482,7 +1482,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3"
],
- "name": "ct-nanobench-3 on Ubuntu-14.04",
+ "name": "ct-nanobench-3",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1611,7 +1611,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4"
],
- "name": "ct-nanobench-4 on Ubuntu-14.04",
+ "name": "ct-nanobench-4",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1740,7 +1740,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5"
],
- "name": "ct-nanobench-5 on Ubuntu-14.04",
+ "name": "ct-nanobench-5",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_100k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_100k_SKPs.json
index 91df7b5c05..dff7626c82 100644
--- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_100k_SKPs.json
+++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_100k_SKPs.json
@@ -906,10 +906,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-dm-1 on Ubuntu-14.04",
+ "stepname:ct-dm-1",
"[dummy hash for ct-dm-1]"
],
- "name": "[trigger] ct-dm-1 on Ubuntu-14.04",
+ "name": "[trigger] ct-dm-1",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -976,10 +976,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-dm-2 on Ubuntu-14.04",
+ "stepname:ct-dm-2",
"[dummy hash for ct-dm-2]"
],
- "name": "[trigger] ct-dm-2 on Ubuntu-14.04",
+ "name": "[trigger] ct-dm-2",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1046,10 +1046,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-dm-3 on Ubuntu-14.04",
+ "stepname:ct-dm-3",
"[dummy hash for ct-dm-3]"
],
- "name": "[trigger] ct-dm-3 on Ubuntu-14.04",
+ "name": "[trigger] ct-dm-3",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1116,10 +1116,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-dm-4 on Ubuntu-14.04",
+ "stepname:ct-dm-4",
"[dummy hash for ct-dm-4]"
],
- "name": "[trigger] ct-dm-4 on Ubuntu-14.04",
+ "name": "[trigger] ct-dm-4",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1186,10 +1186,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-dm-5 on Ubuntu-14.04",
+ "stepname:ct-dm-5",
"[dummy hash for ct-dm-5]"
],
- "name": "[trigger] ct-dm-5 on Ubuntu-14.04",
+ "name": "[trigger] ct-dm-5",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1224,7 +1224,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-dm-1"
],
- "name": "ct-dm-1 on Ubuntu-14.04",
+ "name": "ct-dm-1",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1286,7 +1286,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-dm-2"
],
- "name": "ct-dm-2 on Ubuntu-14.04",
+ "name": "ct-dm-2",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1348,7 +1348,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-dm-3"
],
- "name": "ct-dm-3 on Ubuntu-14.04",
+ "name": "ct-dm-3",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1410,7 +1410,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-dm-4"
],
- "name": "ct-dm-4 on Ubuntu-14.04",
+ "name": "ct-dm-4",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1472,7 +1472,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-dm-5"
],
- "name": "ct-dm-5 on Ubuntu-14.04",
+ "name": "ct-dm-5",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs.json
index c98005a533..4e7dcfc6fe 100644
--- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs.json
+++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs.json
@@ -906,10 +906,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-dm-1 on Ubuntu-14.04",
+ "stepname:ct-dm-1",
"[dummy hash for ct-dm-1]"
],
- "name": "[trigger] ct-dm-1 on Ubuntu-14.04",
+ "name": "[trigger] ct-dm-1",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -976,10 +976,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-dm-2 on Ubuntu-14.04",
+ "stepname:ct-dm-2",
"[dummy hash for ct-dm-2]"
],
- "name": "[trigger] ct-dm-2 on Ubuntu-14.04",
+ "name": "[trigger] ct-dm-2",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1046,10 +1046,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-dm-3 on Ubuntu-14.04",
+ "stepname:ct-dm-3",
"[dummy hash for ct-dm-3]"
],
- "name": "[trigger] ct-dm-3 on Ubuntu-14.04",
+ "name": "[trigger] ct-dm-3",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1116,10 +1116,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-dm-4 on Ubuntu-14.04",
+ "stepname:ct-dm-4",
"[dummy hash for ct-dm-4]"
],
- "name": "[trigger] ct-dm-4 on Ubuntu-14.04",
+ "name": "[trigger] ct-dm-4",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1186,10 +1186,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-dm-5 on Ubuntu-14.04",
+ "stepname:ct-dm-5",
"[dummy hash for ct-dm-5]"
],
- "name": "[trigger] ct-dm-5 on Ubuntu-14.04",
+ "name": "[trigger] ct-dm-5",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1224,7 +1224,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-dm-1"
],
- "name": "ct-dm-1 on Ubuntu-14.04",
+ "name": "ct-dm-1",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1286,7 +1286,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-dm-2"
],
- "name": "ct-dm-2 on Ubuntu-14.04",
+ "name": "ct-dm-2",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1348,7 +1348,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-dm-3"
],
- "name": "ct-dm-3 on Ubuntu-14.04",
+ "name": "ct-dm-3",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1410,7 +1410,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-dm-4"
],
- "name": "ct-dm-4 on Ubuntu-14.04",
+ "name": "ct-dm-4",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1472,7 +1472,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-dm-5"
],
- "name": "ct-dm-5 on Ubuntu-14.04",
+ "name": "ct-dm-5",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs_Trybot.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs_Trybot.json
index c9086ad8ad..49a598953f 100644
--- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs_Trybot.json
+++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs_Trybot.json
@@ -912,10 +912,10 @@
"--tag",
"rietveld:codereview.chromium.org/1499623002/#ps1",
"--tag",
- "stepname:ct-dm-1 on Ubuntu-14.04",
+ "stepname:ct-dm-1",
"[dummy hash for ct-dm-1]"
],
- "name": "[trigger] ct-dm-1 on Ubuntu-14.04",
+ "name": "[trigger] ct-dm-1",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -982,10 +982,10 @@
"--tag",
"rietveld:codereview.chromium.org/1499623002/#ps1",
"--tag",
- "stepname:ct-dm-2 on Ubuntu-14.04",
+ "stepname:ct-dm-2",
"[dummy hash for ct-dm-2]"
],
- "name": "[trigger] ct-dm-2 on Ubuntu-14.04",
+ "name": "[trigger] ct-dm-2",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1052,10 +1052,10 @@
"--tag",
"rietveld:codereview.chromium.org/1499623002/#ps1",
"--tag",
- "stepname:ct-dm-3 on Ubuntu-14.04",
+ "stepname:ct-dm-3",
"[dummy hash for ct-dm-3]"
],
- "name": "[trigger] ct-dm-3 on Ubuntu-14.04",
+ "name": "[trigger] ct-dm-3",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1122,10 +1122,10 @@
"--tag",
"rietveld:codereview.chromium.org/1499623002/#ps1",
"--tag",
- "stepname:ct-dm-4 on Ubuntu-14.04",
+ "stepname:ct-dm-4",
"[dummy hash for ct-dm-4]"
],
- "name": "[trigger] ct-dm-4 on Ubuntu-14.04",
+ "name": "[trigger] ct-dm-4",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1192,10 +1192,10 @@
"--tag",
"rietveld:codereview.chromium.org/1499623002/#ps1",
"--tag",
- "stepname:ct-dm-5 on Ubuntu-14.04",
+ "stepname:ct-dm-5",
"[dummy hash for ct-dm-5]"
],
- "name": "[trigger] ct-dm-5 on Ubuntu-14.04",
+ "name": "[trigger] ct-dm-5",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1230,7 +1230,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-dm-1"
],
- "name": "ct-dm-1 on Ubuntu-14.04",
+ "name": "ct-dm-1",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1292,7 +1292,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-dm-2"
],
- "name": "ct-dm-2 on Ubuntu-14.04",
+ "name": "ct-dm-2",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1354,7 +1354,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-dm-3"
],
- "name": "ct-dm-3 on Ubuntu-14.04",
+ "name": "ct-dm-3",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1416,7 +1416,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-dm-4"
],
- "name": "ct-dm-4 on Ubuntu-14.04",
+ "name": "ct-dm-4",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1478,7 +1478,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-dm-5"
],
- "name": "ct-dm-5 on Ubuntu-14.04",
+ "name": "ct-dm-5",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json
index 9fe0dd89d5..5555c198ee 100644
--- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json
+++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json
@@ -906,10 +906,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-dm-1 on Ubuntu-14.04",
+ "stepname:ct-dm-1",
"[dummy hash for ct-dm-1]"
],
- "name": "[trigger] ct-dm-1 on Ubuntu-14.04",
+ "name": "[trigger] ct-dm-1",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -976,10 +976,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-dm-2 on Ubuntu-14.04",
+ "stepname:ct-dm-2",
"[dummy hash for ct-dm-2]"
],
- "name": "[trigger] ct-dm-2 on Ubuntu-14.04",
+ "name": "[trigger] ct-dm-2",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1046,10 +1046,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-dm-3 on Ubuntu-14.04",
+ "stepname:ct-dm-3",
"[dummy hash for ct-dm-3]"
],
- "name": "[trigger] ct-dm-3 on Ubuntu-14.04",
+ "name": "[trigger] ct-dm-3",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1116,10 +1116,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-dm-4 on Ubuntu-14.04",
+ "stepname:ct-dm-4",
"[dummy hash for ct-dm-4]"
],
- "name": "[trigger] ct-dm-4 on Ubuntu-14.04",
+ "name": "[trigger] ct-dm-4",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1186,10 +1186,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-dm-5 on Ubuntu-14.04",
+ "stepname:ct-dm-5",
"[dummy hash for ct-dm-5]"
],
- "name": "[trigger] ct-dm-5 on Ubuntu-14.04",
+ "name": "[trigger] ct-dm-5",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1224,7 +1224,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-dm-1"
],
- "name": "ct-dm-1 on Ubuntu-14.04",
+ "name": "ct-dm-1",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1286,7 +1286,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-dm-2"
],
- "name": "ct-dm-2 on Ubuntu-14.04",
+ "name": "ct-dm-2",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1348,7 +1348,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-dm-3"
],
- "name": "ct-dm-3 on Ubuntu-14.04",
+ "name": "ct-dm-3",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1410,7 +1410,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-dm-4"
],
- "name": "ct-dm-4 on Ubuntu-14.04",
+ "name": "ct-dm-4",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1472,7 +1472,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-dm-5"
],
- "name": "ct-dm-5 on Ubuntu-14.04",
+ "name": "ct-dm-5",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json
index 9f282b25bb..90b80c7360 100644
--- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json
+++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json
@@ -906,10 +906,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-dm-1 on Ubuntu-14.04",
+ "stepname:ct-dm-1",
"[dummy hash for ct-dm-1]"
],
- "name": "[trigger] ct-dm-1 on Ubuntu-14.04",
+ "name": "[trigger] ct-dm-1",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -976,10 +976,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-dm-2 on Ubuntu-14.04",
+ "stepname:ct-dm-2",
"[dummy hash for ct-dm-2]"
],
- "name": "[trigger] ct-dm-2 on Ubuntu-14.04",
+ "name": "[trigger] ct-dm-2",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1046,10 +1046,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-dm-3 on Ubuntu-14.04",
+ "stepname:ct-dm-3",
"[dummy hash for ct-dm-3]"
],
- "name": "[trigger] ct-dm-3 on Ubuntu-14.04",
+ "name": "[trigger] ct-dm-3",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1116,10 +1116,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-dm-4 on Ubuntu-14.04",
+ "stepname:ct-dm-4",
"[dummy hash for ct-dm-4]"
],
- "name": "[trigger] ct-dm-4 on Ubuntu-14.04",
+ "name": "[trigger] ct-dm-4",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1186,10 +1186,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-dm-5 on Ubuntu-14.04",
+ "stepname:ct-dm-5",
"[dummy hash for ct-dm-5]"
],
- "name": "[trigger] ct-dm-5 on Ubuntu-14.04",
+ "name": "[trigger] ct-dm-5",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1224,7 +1224,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-dm-1"
],
- "name": "ct-dm-1 on Ubuntu-14.04",
+ "name": "ct-dm-1",
"~followup_annotations": [
"step returned non-zero exit code: 1",
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
@@ -1290,7 +1290,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-dm-2"
],
- "name": "ct-dm-2 on Ubuntu-14.04",
+ "name": "ct-dm-2",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1352,7 +1352,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-dm-3"
],
- "name": "ct-dm-3 on Ubuntu-14.04",
+ "name": "ct-dm-3",
"~followup_annotations": [
"step returned non-zero exit code: 1",
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
@@ -1418,7 +1418,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-dm-4"
],
- "name": "ct-dm-4 on Ubuntu-14.04",
+ "name": "ct-dm-4",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1480,7 +1480,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-dm-5"
],
- "name": "ct-dm-5 on Ubuntu-14.04",
+ "name": "ct-dm-5",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1527,7 +1527,7 @@
},
{
"name": "$result",
- "reason": "Failed steps: ct-dm-1 on Ubuntu-14.04, ct-dm-3 on Ubuntu-14.04",
+ "reason": "Failed steps: ct-dm-1, ct-dm-3",
"recipe_result": null,
"status_code": 1
}
diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json
index 7c5d5d7d47..0983f2e602 100644
--- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json
+++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json
@@ -906,10 +906,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-dm-1 on Ubuntu-14.04",
+ "stepname:ct-dm-1",
"[dummy hash for ct-dm-1]"
],
- "name": "[trigger] ct-dm-1 on Ubuntu-14.04",
+ "name": "[trigger] ct-dm-1",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -976,10 +976,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-dm-2 on Ubuntu-14.04",
+ "stepname:ct-dm-2",
"[dummy hash for ct-dm-2]"
],
- "name": "[trigger] ct-dm-2 on Ubuntu-14.04",
+ "name": "[trigger] ct-dm-2",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1046,10 +1046,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-dm-3 on Ubuntu-14.04",
+ "stepname:ct-dm-3",
"[dummy hash for ct-dm-3]"
],
- "name": "[trigger] ct-dm-3 on Ubuntu-14.04",
+ "name": "[trigger] ct-dm-3",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1116,10 +1116,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-dm-4 on Ubuntu-14.04",
+ "stepname:ct-dm-4",
"[dummy hash for ct-dm-4]"
],
- "name": "[trigger] ct-dm-4 on Ubuntu-14.04",
+ "name": "[trigger] ct-dm-4",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1186,10 +1186,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-dm-5 on Ubuntu-14.04",
+ "stepname:ct-dm-5",
"[dummy hash for ct-dm-5]"
],
- "name": "[trigger] ct-dm-5 on Ubuntu-14.04",
+ "name": "[trigger] ct-dm-5",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1224,7 +1224,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-dm-1"
],
- "name": "ct-dm-1 on Ubuntu-14.04",
+ "name": "ct-dm-1",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1286,7 +1286,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-dm-2"
],
- "name": "ct-dm-2 on Ubuntu-14.04",
+ "name": "ct-dm-2",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1348,7 +1348,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-dm-3"
],
- "name": "ct-dm-3 on Ubuntu-14.04",
+ "name": "ct-dm-3",
"~followup_annotations": [
"step returned non-zero exit code: 1",
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
@@ -1414,7 +1414,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-dm-4"
],
- "name": "ct-dm-4 on Ubuntu-14.04",
+ "name": "ct-dm-4",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1476,7 +1476,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-dm-5"
],
- "name": "ct-dm-5 on Ubuntu-14.04",
+ "name": "ct-dm-5",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1523,7 +1523,7 @@
},
{
"name": "$result",
- "reason": "Failed steps: ct-dm-3 on Ubuntu-14.04",
+ "reason": "Failed steps: ct-dm-3",
"recipe_result": null,
"status_code": 1
}
diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json
index 250fbd17c5..5145712ecd 100644
--- a/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json
+++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json
@@ -909,10 +909,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-nanobench-1 on Ubuntu-14.04",
+ "stepname:ct-nanobench-1",
"[dummy hash for ct-nanobench-1]"
],
- "name": "[trigger] ct-nanobench-1 on Ubuntu-14.04",
+ "name": "[trigger] ct-nanobench-1",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -982,10 +982,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-nanobench-2 on Ubuntu-14.04",
+ "stepname:ct-nanobench-2",
"[dummy hash for ct-nanobench-2]"
],
- "name": "[trigger] ct-nanobench-2 on Ubuntu-14.04",
+ "name": "[trigger] ct-nanobench-2",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1055,10 +1055,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-nanobench-3 on Ubuntu-14.04",
+ "stepname:ct-nanobench-3",
"[dummy hash for ct-nanobench-3]"
],
- "name": "[trigger] ct-nanobench-3 on Ubuntu-14.04",
+ "name": "[trigger] ct-nanobench-3",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1128,10 +1128,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-nanobench-4 on Ubuntu-14.04",
+ "stepname:ct-nanobench-4",
"[dummy hash for ct-nanobench-4]"
],
- "name": "[trigger] ct-nanobench-4 on Ubuntu-14.04",
+ "name": "[trigger] ct-nanobench-4",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1201,10 +1201,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-nanobench-5 on Ubuntu-14.04",
+ "stepname:ct-nanobench-5",
"[dummy hash for ct-nanobench-5]"
],
- "name": "[trigger] ct-nanobench-5 on Ubuntu-14.04",
+ "name": "[trigger] ct-nanobench-5",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1239,7 +1239,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1"
],
- "name": "ct-nanobench-1 on Ubuntu-14.04",
+ "name": "ct-nanobench-1",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1368,7 +1368,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2"
],
- "name": "ct-nanobench-2 on Ubuntu-14.04",
+ "name": "ct-nanobench-2",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1497,7 +1497,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3"
],
- "name": "ct-nanobench-3 on Ubuntu-14.04",
+ "name": "ct-nanobench-3",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1626,7 +1626,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4"
],
- "name": "ct-nanobench-4 on Ubuntu-14.04",
+ "name": "ct-nanobench-4",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1755,7 +1755,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5"
],
- "name": "ct-nanobench-5 on Ubuntu-14.04",
+ "name": "ct-nanobench-5",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json
index 006e1fbcbd..db22082669 100644
--- a/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json
+++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json
@@ -909,10 +909,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-nanobench-1 on Ubuntu-14.04",
+ "stepname:ct-nanobench-1",
"[dummy hash for ct-nanobench-1]"
],
- "name": "[trigger] ct-nanobench-1 on Ubuntu-14.04",
+ "name": "[trigger] ct-nanobench-1",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -982,10 +982,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-nanobench-2 on Ubuntu-14.04",
+ "stepname:ct-nanobench-2",
"[dummy hash for ct-nanobench-2]"
],
- "name": "[trigger] ct-nanobench-2 on Ubuntu-14.04",
+ "name": "[trigger] ct-nanobench-2",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1055,10 +1055,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-nanobench-3 on Ubuntu-14.04",
+ "stepname:ct-nanobench-3",
"[dummy hash for ct-nanobench-3]"
],
- "name": "[trigger] ct-nanobench-3 on Ubuntu-14.04",
+ "name": "[trigger] ct-nanobench-3",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1128,10 +1128,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-nanobench-4 on Ubuntu-14.04",
+ "stepname:ct-nanobench-4",
"[dummy hash for ct-nanobench-4]"
],
- "name": "[trigger] ct-nanobench-4 on Ubuntu-14.04",
+ "name": "[trigger] ct-nanobench-4",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1201,10 +1201,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-nanobench-5 on Ubuntu-14.04",
+ "stepname:ct-nanobench-5",
"[dummy hash for ct-nanobench-5]"
],
- "name": "[trigger] ct-nanobench-5 on Ubuntu-14.04",
+ "name": "[trigger] ct-nanobench-5",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1239,7 +1239,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1"
],
- "name": "ct-nanobench-1 on Ubuntu-14.04",
+ "name": "ct-nanobench-1",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1368,7 +1368,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2"
],
- "name": "ct-nanobench-2 on Ubuntu-14.04",
+ "name": "ct-nanobench-2",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1497,7 +1497,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3"
],
- "name": "ct-nanobench-3 on Ubuntu-14.04",
+ "name": "ct-nanobench-3",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1626,7 +1626,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4"
],
- "name": "ct-nanobench-4 on Ubuntu-14.04",
+ "name": "ct-nanobench-4",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1755,7 +1755,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5"
],
- "name": "ct-nanobench-5 on Ubuntu-14.04",
+ "name": "ct-nanobench-5",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json
index 8bb8b7e570..37c7cf73ad 100644
--- a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json
+++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json
@@ -906,10 +906,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-get_images_from_skps-1 on Ubuntu-14.04",
+ "stepname:ct-get_images_from_skps-1",
"[dummy hash for ct-get_images_from_skps-1]"
],
- "name": "[trigger] ct-get_images_from_skps-1 on Ubuntu-14.04",
+ "name": "[trigger] ct-get_images_from_skps-1",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -976,10 +976,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-get_images_from_skps-2 on Ubuntu-14.04",
+ "stepname:ct-get_images_from_skps-2",
"[dummy hash for ct-get_images_from_skps-2]"
],
- "name": "[trigger] ct-get_images_from_skps-2 on Ubuntu-14.04",
+ "name": "[trigger] ct-get_images_from_skps-2",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1046,10 +1046,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-get_images_from_skps-3 on Ubuntu-14.04",
+ "stepname:ct-get_images_from_skps-3",
"[dummy hash for ct-get_images_from_skps-3]"
],
- "name": "[trigger] ct-get_images_from_skps-3 on Ubuntu-14.04",
+ "name": "[trigger] ct-get_images_from_skps-3",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1116,10 +1116,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-get_images_from_skps-4 on Ubuntu-14.04",
+ "stepname:ct-get_images_from_skps-4",
"[dummy hash for ct-get_images_from_skps-4]"
],
- "name": "[trigger] ct-get_images_from_skps-4 on Ubuntu-14.04",
+ "name": "[trigger] ct-get_images_from_skps-4",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1186,10 +1186,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-get_images_from_skps-5 on Ubuntu-14.04",
+ "stepname:ct-get_images_from_skps-5",
"[dummy hash for ct-get_images_from_skps-5]"
],
- "name": "[trigger] ct-get_images_from_skps-5 on Ubuntu-14.04",
+ "name": "[trigger] ct-get_images_from_skps-5",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1224,7 +1224,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-1"
],
- "name": "ct-get_images_from_skps-1 on Ubuntu-14.04",
+ "name": "ct-get_images_from_skps-1",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1286,7 +1286,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-2"
],
- "name": "ct-get_images_from_skps-2 on Ubuntu-14.04",
+ "name": "ct-get_images_from_skps-2",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1348,7 +1348,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-3"
],
- "name": "ct-get_images_from_skps-3 on Ubuntu-14.04",
+ "name": "ct-get_images_from_skps-3",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1410,7 +1410,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-4"
],
- "name": "ct-get_images_from_skps-4 on Ubuntu-14.04",
+ "name": "ct-get_images_from_skps-4",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1472,7 +1472,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-5"
],
- "name": "ct-get_images_from_skps-5 on Ubuntu-14.04",
+ "name": "ct-get_images_from_skps-5",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json
index 1c45797555..743fb3a888 100644
--- a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json
+++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json
@@ -906,10 +906,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-get_images_from_skps-1 on Ubuntu-14.04",
+ "stepname:ct-get_images_from_skps-1",
"[dummy hash for ct-get_images_from_skps-1]"
],
- "name": "[trigger] ct-get_images_from_skps-1 on Ubuntu-14.04",
+ "name": "[trigger] ct-get_images_from_skps-1",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -976,10 +976,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-get_images_from_skps-2 on Ubuntu-14.04",
+ "stepname:ct-get_images_from_skps-2",
"[dummy hash for ct-get_images_from_skps-2]"
],
- "name": "[trigger] ct-get_images_from_skps-2 on Ubuntu-14.04",
+ "name": "[trigger] ct-get_images_from_skps-2",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1046,10 +1046,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-get_images_from_skps-3 on Ubuntu-14.04",
+ "stepname:ct-get_images_from_skps-3",
"[dummy hash for ct-get_images_from_skps-3]"
],
- "name": "[trigger] ct-get_images_from_skps-3 on Ubuntu-14.04",
+ "name": "[trigger] ct-get_images_from_skps-3",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1116,10 +1116,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-get_images_from_skps-4 on Ubuntu-14.04",
+ "stepname:ct-get_images_from_skps-4",
"[dummy hash for ct-get_images_from_skps-4]"
],
- "name": "[trigger] ct-get_images_from_skps-4 on Ubuntu-14.04",
+ "name": "[trigger] ct-get_images_from_skps-4",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1186,10 +1186,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-get_images_from_skps-5 on Ubuntu-14.04",
+ "stepname:ct-get_images_from_skps-5",
"[dummy hash for ct-get_images_from_skps-5]"
],
- "name": "[trigger] ct-get_images_from_skps-5 on Ubuntu-14.04",
+ "name": "[trigger] ct-get_images_from_skps-5",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1224,7 +1224,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-1"
],
- "name": "ct-get_images_from_skps-1 on Ubuntu-14.04",
+ "name": "ct-get_images_from_skps-1",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1286,7 +1286,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-2"
],
- "name": "ct-get_images_from_skps-2 on Ubuntu-14.04",
+ "name": "ct-get_images_from_skps-2",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1348,7 +1348,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-3"
],
- "name": "ct-get_images_from_skps-3 on Ubuntu-14.04",
+ "name": "ct-get_images_from_skps-3",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1410,7 +1410,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-4"
],
- "name": "ct-get_images_from_skps-4 on Ubuntu-14.04",
+ "name": "ct-get_images_from_skps-4",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1472,7 +1472,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-5"
],
- "name": "ct-get_images_from_skps-5 on Ubuntu-14.04",
+ "name": "ct-get_images_from_skps-5",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json
index 53afc6d43c..86a0e532d9 100644
--- a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json
+++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json
@@ -906,10 +906,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-get_images_from_skps-1 on Ubuntu-14.04",
+ "stepname:ct-get_images_from_skps-1",
"[dummy hash for ct-get_images_from_skps-1]"
],
- "name": "[trigger] ct-get_images_from_skps-1 on Ubuntu-14.04",
+ "name": "[trigger] ct-get_images_from_skps-1",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -976,10 +976,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-get_images_from_skps-2 on Ubuntu-14.04",
+ "stepname:ct-get_images_from_skps-2",
"[dummy hash for ct-get_images_from_skps-2]"
],
- "name": "[trigger] ct-get_images_from_skps-2 on Ubuntu-14.04",
+ "name": "[trigger] ct-get_images_from_skps-2",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1046,10 +1046,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-get_images_from_skps-3 on Ubuntu-14.04",
+ "stepname:ct-get_images_from_skps-3",
"[dummy hash for ct-get_images_from_skps-3]"
],
- "name": "[trigger] ct-get_images_from_skps-3 on Ubuntu-14.04",
+ "name": "[trigger] ct-get_images_from_skps-3",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1116,10 +1116,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-get_images_from_skps-4 on Ubuntu-14.04",
+ "stepname:ct-get_images_from_skps-4",
"[dummy hash for ct-get_images_from_skps-4]"
],
- "name": "[trigger] ct-get_images_from_skps-4 on Ubuntu-14.04",
+ "name": "[trigger] ct-get_images_from_skps-4",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1186,10 +1186,10 @@
"--tag",
"revision:abc123",
"--tag",
- "stepname:ct-get_images_from_skps-5 on Ubuntu-14.04",
+ "stepname:ct-get_images_from_skps-5",
"[dummy hash for ct-get_images_from_skps-5]"
],
- "name": "[trigger] ct-get_images_from_skps-5 on Ubuntu-14.04",
+ "name": "[trigger] ct-get_images_from_skps-5",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1224,7 +1224,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-1"
],
- "name": "ct-get_images_from_skps-1 on Ubuntu-14.04",
+ "name": "ct-get_images_from_skps-1",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1286,7 +1286,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-2"
],
- "name": "ct-get_images_from_skps-2 on Ubuntu-14.04",
+ "name": "ct-get_images_from_skps-2",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1348,7 +1348,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-3"
],
- "name": "ct-get_images_from_skps-3 on Ubuntu-14.04",
+ "name": "ct-get_images_from_skps-3",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1410,7 +1410,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-4"
],
- "name": "ct-get_images_from_skps-4 on Ubuntu-14.04",
+ "name": "ct-get_images_from_skps-4",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1472,7 +1472,7 @@
"--task-output-dir",
"[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-5"
],
- "name": "ct-get_images_from_skps-5 on Ubuntu-14.04",
+ "name": "ct-get_images_from_skps-5",
"~followup_annotations": [
"@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
diff --git a/infra/bots/recipes/swarm_ct_skps.py b/infra/bots/recipes/swarm_ct_skps.py
index 7f998eaa9d..84f122a45e 100644
--- a/infra/bots/recipes/swarm_ct_skps.py
+++ b/infra/bots/recipes/swarm_ct_skps.py
@@ -426,7 +426,7 @@ def GenTests(api):
yield(
api.test('CT_DM_1m_SKPs_slave3_failure') +
- api.step_data('ct-dm-3 on Ubuntu-14.04', retcode=1) +
+ api.step_data('ct-dm-3', retcode=1) +
api.properties(
buildername='Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs',
mastername=mastername,
@@ -443,8 +443,8 @@ def GenTests(api):
yield(
api.test('CT_DM_1m_SKPs_2slaves_failure') +
- api.step_data('ct-dm-1 on Ubuntu-14.04', retcode=1) +
- api.step_data('ct-dm-3 on Ubuntu-14.04', retcode=1) +
+ api.step_data('ct-dm-1', retcode=1) +
+ api.step_data('ct-dm-3', retcode=1) +
api.properties(
buildername='Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs',
mastername=mastername,
diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg
index ff5505399f..bbe4f900f6 100644
--- a/infra/config/recipes.cfg
+++ b/infra/config/recipes.cfg
@@ -5,7 +5,7 @@ deps {
project_id: "build"
url: "https://chromium.googlesource.com/chromium/tools/build.git"
branch: "master"
- revision: "9905c586f21486d42a51851ba992cc09a0adcc2c"
+ revision: "97ab90fa065032f1af2f7d76ecd8c2e7a0f60a48"
}
deps {
project_id: "depot_tools"