From 6bc873f0be2c3351d34d92e85910ed7fab7a6bce Mon Sep 17 00:00:00 2001 From: recipe-roller Date: Tue, 18 Apr 2017 18:53:29 -0700 Subject: Roll recipe dependencies (nontrivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). Please review the expectation changes, and LGTM+CQ. More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug. build: https://crrev.com/06e6b3accc66f6c31053055c8e0efcd978f18b03 Implement a generic postprocess/merge hook for swarming tasks. (RELAND 4) (jbudorick@chromium.org) Change-Id: Ib62301f7336873f022cd5a7efe8df577c1414689 Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Reviewed-on: https://skia-review.googlesource.com/13775 Commit-Queue: Eric Boren Reviewed-by: Eric Boren --- .../ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json | 95 ++++++++++++++++++---- .../recipes/ct_skps.expected/CT_DM_100k_SKPs.json | 95 ++++++++++++++++++---- .../recipes/ct_skps.expected/CT_DM_10k_SKPs.json | 95 ++++++++++++++++++---- .../ct_skps.expected/CT_DM_10k_SKPs_Trybot.json | 95 ++++++++++++++++++---- .../recipes/ct_skps.expected/CT_DM_1m_SKPs.json | 95 ++++++++++++++++++---- .../CT_DM_1m_SKPs_2slaves_failure.json | 95 ++++++++++++++++++---- .../CT_DM_1m_SKPs_slave3_failure.json | 95 ++++++++++++++++++---- .../ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json | 95 ++++++++++++++++++---- .../ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json | 95 ++++++++++++++++++---- .../ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json | 95 ++++++++++++++++++---- .../ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json | 95 ++++++++++++++++++---- .../CT_IMG_DECODE_10k_SKPs_Trybot.json | 95 ++++++++++++++++++---- 12 files changed, 960 insertions(+), 180 deletions(-) (limited to 'infra/bots/recipes') 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 f148514593..ead01e75fb 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 @@ -1209,6 +1209,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1220,13 +1232,14 @@ "--json", "{\"base_task_name\": \"ct-nanobench-1/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/-1\", \"tasks\": {\"ct-nanobench-1/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-nanobench-1", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1343,6 +1356,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1354,13 +1379,14 @@ "--json", "{\"base_task_name\": \"ct-nanobench-2/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/-1\", \"tasks\": {\"ct-nanobench-2/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-nanobench-2", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1477,6 +1503,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1488,13 +1526,14 @@ "--json", "{\"base_task_name\": \"ct-nanobench-3/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/-1\", \"tasks\": {\"ct-nanobench-3/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-nanobench-3", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1611,6 +1650,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1622,13 +1673,14 @@ "--json", "{\"base_task_name\": \"ct-nanobench-4/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/-1\", \"tasks\": {\"ct-nanobench-4/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-nanobench-4", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1745,6 +1797,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1756,13 +1820,14 @@ "--json", "{\"base_task_name\": \"ct-nanobench-5/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/-1\", \"tasks\": {\"ct-nanobench-5/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-nanobench-5", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", 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 2cb7ff516d..1db16ebbcb 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 @@ -1209,6 +1209,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-1", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1220,13 +1232,14 @@ "--json", "{\"base_task_name\": \"ct-dm-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/-1\", \"tasks\": {\"ct-dm-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-1" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-1", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1274,6 +1287,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-2", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1285,13 +1310,14 @@ "--json", "{\"base_task_name\": \"ct-dm-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/-1\", \"tasks\": {\"ct-dm-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-2" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-2", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1339,6 +1365,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-3", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1350,13 +1388,14 @@ "--json", "{\"base_task_name\": \"ct-dm-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/-1\", \"tasks\": {\"ct-dm-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-3" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-3", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1404,6 +1443,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-4", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1415,13 +1466,14 @@ "--json", "{\"base_task_name\": \"ct-dm-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/-1\", \"tasks\": {\"ct-dm-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-4" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-4", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1469,6 +1521,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-5", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1480,13 +1544,14 @@ "--json", "{\"base_task_name\": \"ct-dm-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/-1\", \"tasks\": {\"ct-dm-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-5" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-5", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", 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 0a0363387e..ed443e8e69 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 @@ -1209,6 +1209,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-1", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1220,13 +1232,14 @@ "--json", "{\"base_task_name\": \"ct-dm-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/-1\", \"tasks\": {\"ct-dm-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-1" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-1", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1274,6 +1287,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-2", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1285,13 +1310,14 @@ "--json", "{\"base_task_name\": \"ct-dm-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/-1\", \"tasks\": {\"ct-dm-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-2" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-2", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1339,6 +1365,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-3", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1350,13 +1388,14 @@ "--json", "{\"base_task_name\": \"ct-dm-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/-1\", \"tasks\": {\"ct-dm-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-3" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-3", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1404,6 +1443,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-4", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1415,13 +1466,14 @@ "--json", "{\"base_task_name\": \"ct-dm-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/-1\", \"tasks\": {\"ct-dm-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-4" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-4", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1469,6 +1521,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-5", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1480,13 +1544,14 @@ "--json", "{\"base_task_name\": \"ct-dm-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/-1\", \"tasks\": {\"ct-dm-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-5" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-5", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", 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 0e3ecb40ce..5dd02eabf7 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 @@ -1233,6 +1233,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-1", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1244,13 +1256,14 @@ "--json", "{\"base_task_name\": \"ct-dm-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/571\", \"tasks\": {\"ct-dm-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-1" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-1", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1298,6 +1311,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-2", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1309,13 +1334,14 @@ "--json", "{\"base_task_name\": \"ct-dm-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/571\", \"tasks\": {\"ct-dm-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-2" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-2", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1363,6 +1389,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-3", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1374,13 +1412,14 @@ "--json", "{\"base_task_name\": \"ct-dm-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/571\", \"tasks\": {\"ct-dm-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-3" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-3", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1428,6 +1467,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-4", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1439,13 +1490,14 @@ "--json", "{\"base_task_name\": \"ct-dm-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/571\", \"tasks\": {\"ct-dm-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-4" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-4", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1493,6 +1545,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-5", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1504,13 +1568,14 @@ "--json", "{\"base_task_name\": \"ct-dm-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/571\", \"tasks\": {\"ct-dm-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-5" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-5", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", 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 1c12f21f1f..c9e5f0db8e 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 @@ -1209,6 +1209,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-1", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1220,13 +1232,14 @@ "--json", "{\"base_task_name\": \"ct-dm-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\", \"tasks\": {\"ct-dm-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-1" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-1", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1274,6 +1287,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-2", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1285,13 +1310,14 @@ "--json", "{\"base_task_name\": \"ct-dm-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\", \"tasks\": {\"ct-dm-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-2" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-2", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1339,6 +1365,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-3", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1350,13 +1388,14 @@ "--json", "{\"base_task_name\": \"ct-dm-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\", \"tasks\": {\"ct-dm-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-3" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-3", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1404,6 +1443,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-4", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1415,13 +1466,14 @@ "--json", "{\"base_task_name\": \"ct-dm-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\", \"tasks\": {\"ct-dm-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-4" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-4", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1469,6 +1521,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-5", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1480,13 +1544,14 @@ "--json", "{\"base_task_name\": \"ct-dm-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\", \"tasks\": {\"ct-dm-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-5" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-5", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", 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 ce91cc799b..7e443f6ece 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 @@ -1209,6 +1209,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-1", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1220,14 +1232,15 @@ "--json", "{\"base_task_name\": \"ct-dm-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\", \"tasks\": {\"ct-dm-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-1" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-1", "~followup_annotations": [ "step returned non-zero exit code: 1", "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1278,6 +1291,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-2", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1289,13 +1314,14 @@ "--json", "{\"base_task_name\": \"ct-dm-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\", \"tasks\": {\"ct-dm-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-2" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-2", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1343,6 +1369,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-3", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1354,14 +1392,15 @@ "--json", "{\"base_task_name\": \"ct-dm-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\", \"tasks\": {\"ct-dm-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-3" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-3", "~followup_annotations": [ "step returned non-zero exit code: 1", "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1412,6 +1451,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-4", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1423,13 +1474,14 @@ "--json", "{\"base_task_name\": \"ct-dm-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\", \"tasks\": {\"ct-dm-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-4" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-4", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1477,6 +1529,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-5", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1488,13 +1552,14 @@ "--json", "{\"base_task_name\": \"ct-dm-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\", \"tasks\": {\"ct-dm-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-5" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-5", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", 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 f2dcb1163e..c2ebcd0482 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 @@ -1209,6 +1209,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-1", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1220,13 +1232,14 @@ "--json", "{\"base_task_name\": \"ct-dm-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\", \"tasks\": {\"ct-dm-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-1" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-1", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1274,6 +1287,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-2", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1285,13 +1310,14 @@ "--json", "{\"base_task_name\": \"ct-dm-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\", \"tasks\": {\"ct-dm-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-2" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-2", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1339,6 +1365,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-3", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1350,14 +1388,15 @@ "--json", "{\"base_task_name\": \"ct-dm-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\", \"tasks\": {\"ct-dm-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-3" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-3", "~followup_annotations": [ "step returned non-zero exit code: 1", "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1408,6 +1447,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-4", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1419,13 +1470,14 @@ "--json", "{\"base_task_name\": \"ct-dm-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\", \"tasks\": {\"ct-dm-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-4" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-4", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1473,6 +1525,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-5", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1484,13 +1548,14 @@ "--json", "{\"base_task_name\": \"ct-dm-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\", \"tasks\": {\"ct-dm-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-5" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-5", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", 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 f79abc71b2..2b3ae236b4 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 @@ -1224,6 +1224,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1235,13 +1247,14 @@ "--json", "{\"base_task_name\": \"ct-nanobench-1/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/-1\", \"tasks\": {\"ct-nanobench-1/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-nanobench-1", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1358,6 +1371,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1369,13 +1394,14 @@ "--json", "{\"base_task_name\": \"ct-nanobench-2/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/-1\", \"tasks\": {\"ct-nanobench-2/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-nanobench-2", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1492,6 +1518,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1503,13 +1541,14 @@ "--json", "{\"base_task_name\": \"ct-nanobench-3/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/-1\", \"tasks\": {\"ct-nanobench-3/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-nanobench-3", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1626,6 +1665,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1637,13 +1688,14 @@ "--json", "{\"base_task_name\": \"ct-nanobench-4/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/-1\", \"tasks\": {\"ct-nanobench-4/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-nanobench-4", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1760,6 +1812,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1771,13 +1835,14 @@ "--json", "{\"base_task_name\": \"ct-nanobench-5/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/-1\", \"tasks\": {\"ct-nanobench-5/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-nanobench-5", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", 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 456e8eb912..7da69c3ffa 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 @@ -1224,6 +1224,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1235,13 +1247,14 @@ "--json", "{\"base_task_name\": \"ct-nanobench-1/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/-1\", \"tasks\": {\"ct-nanobench-1/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-nanobench-1", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1358,6 +1371,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1369,13 +1394,14 @@ "--json", "{\"base_task_name\": \"ct-nanobench-2/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/-1\", \"tasks\": {\"ct-nanobench-2/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-nanobench-2", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1492,6 +1518,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1503,13 +1541,14 @@ "--json", "{\"base_task_name\": \"ct-nanobench-3/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/-1\", \"tasks\": {\"ct-nanobench-3/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-nanobench-3", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1626,6 +1665,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1637,13 +1688,14 @@ "--json", "{\"base_task_name\": \"ct-nanobench-4/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/-1\", \"tasks\": {\"ct-nanobench-4/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-nanobench-4", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1760,6 +1812,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1771,13 +1835,14 @@ "--json", "{\"base_task_name\": \"ct-nanobench-5/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/-1\", \"tasks\": {\"ct-nanobench-5/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-nanobench-5", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", 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 be747afb0c..295b026562 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 @@ -1209,6 +1209,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-1", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1220,13 +1232,14 @@ "--json", "{\"base_task_name\": \"ct-get_images_from_skps-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/-1\", \"tasks\": {\"ct-get_images_from_skps-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-1" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-get_images_from_skps-1", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1274,6 +1287,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-2", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1285,13 +1310,14 @@ "--json", "{\"base_task_name\": \"ct-get_images_from_skps-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/-1\", \"tasks\": {\"ct-get_images_from_skps-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-2" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-get_images_from_skps-2", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1339,6 +1365,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-3", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1350,13 +1388,14 @@ "--json", "{\"base_task_name\": \"ct-get_images_from_skps-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/-1\", \"tasks\": {\"ct-get_images_from_skps-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-3" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-get_images_from_skps-3", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1404,6 +1443,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-4", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1415,13 +1466,14 @@ "--json", "{\"base_task_name\": \"ct-get_images_from_skps-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/-1\", \"tasks\": {\"ct-get_images_from_skps-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-4" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-get_images_from_skps-4", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1469,6 +1521,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-5", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1480,13 +1544,14 @@ "--json", "{\"base_task_name\": \"ct-get_images_from_skps-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/-1\", \"tasks\": {\"ct-get_images_from_skps-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-5" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-get_images_from_skps-5", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", 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 9235c24c18..271bcfaa52 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 @@ -1209,6 +1209,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-1", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1220,13 +1232,14 @@ "--json", "{\"base_task_name\": \"ct-get_images_from_skps-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/-1\", \"tasks\": {\"ct-get_images_from_skps-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-1" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-get_images_from_skps-1", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1274,6 +1287,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-2", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1285,13 +1310,14 @@ "--json", "{\"base_task_name\": \"ct-get_images_from_skps-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/-1\", \"tasks\": {\"ct-get_images_from_skps-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-2" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-get_images_from_skps-2", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1339,6 +1365,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-3", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1350,13 +1388,14 @@ "--json", "{\"base_task_name\": \"ct-get_images_from_skps-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/-1\", \"tasks\": {\"ct-get_images_from_skps-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-3" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-get_images_from_skps-3", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1404,6 +1443,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-4", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1415,13 +1466,14 @@ "--json", "{\"base_task_name\": \"ct-get_images_from_skps-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/-1\", \"tasks\": {\"ct-get_images_from_skps-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-4" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-get_images_from_skps-4", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1469,6 +1521,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-5", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1480,13 +1544,14 @@ "--json", "{\"base_task_name\": \"ct-get_images_from_skps-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/-1\", \"tasks\": {\"ct-get_images_from_skps-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-5" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-get_images_from_skps-5", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", 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 f8b4dacd4b..c045923f23 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 @@ -1243,6 +1243,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-1", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1254,13 +1266,14 @@ "--json", "{\"base_task_name\": \"ct-get_images_from_skps-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/571\", \"tasks\": {\"ct-get_images_from_skps-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-1" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-get_images_from_skps-1", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1308,6 +1321,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-2", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1319,13 +1344,14 @@ "--json", "{\"base_task_name\": \"ct-get_images_from_skps-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/571\", \"tasks\": {\"ct-get_images_from_skps-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-2" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-get_images_from_skps-2", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1373,6 +1399,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-3", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1384,13 +1422,14 @@ "--json", "{\"base_task_name\": \"ct-get_images_from_skps-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/571\", \"tasks\": {\"ct-get_images_from_skps-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-3" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-get_images_from_skps-3", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1438,6 +1477,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-4", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1449,13 +1500,14 @@ "--json", "{\"base_task_name\": \"ct-get_images_from_skps-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/571\", \"tasks\": {\"ct-get_images_from_skps-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-4" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-get_images_from_skps-4", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1503,6 +1555,18 @@ }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-5", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", "python", "-u", "[START_DIR]/swarming.client/swarming.py", @@ -1514,13 +1578,14 @@ "--json", "{\"base_task_name\": \"ct-get_images_from_skps-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/571\", \"tasks\": {\"ct-get_images_from_skps-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-5" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-get_images_from_skps-5", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'
swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", -- cgit v1.2.3