diff options
| author |  Eric Boren <borenet@google.com> | 2017-04-19 11:12:20 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-19 11:12:25 +0000 |
| commit | c1e9617e82a2d573c890ee17e69a3d4699800f05 (patch) | |
| tree | f6b77bff760fbf16671eee1b698ec4b0cf870f09 | |
| parent | d71730accb629f8c67de58c277fc6bc94f8fc222 (diff) | |
Revert "Roll recipe dependencies (nontrivial)."
This reverts commit 6bc873f0be2c3351d34d92e85910ed7fab7a6bce.
Reason for revert: Broke CT SKPs bots
Original change's description:
> 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 <borenet@google.com>
> Reviewed-by: Eric Boren <borenet@google.com>
>
TBR=borenet@google.com,rmistry@google.com,recipe-roller@chromium.org,reviews@skia.org,iannucci@google.com,jbudorick@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I534dfb1d9adbb57ccafa1c1306b852106a7f8c31
Reviewed-on: https://skia-review.googlesource.com/13778
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
14 files changed, 182 insertions, 962 deletions
diff --git a/infra/bots/recipes.py b/infra/bots/recipes.py index dc7077b007..7bb2c1f334 100755 --- a/infra/bots/recipes.py +++ b/infra/bots/recipes.py @@ -102,7 +102,7 @@ def find_engine_override(argv): any, or None if the user didn't override it.""" PREFIX = 'recipe_engine=' - p = argparse.ArgumentParser() + p = argparse.ArgumentParser(add_help=False) p.add_argument('-O', '--project-override', action='append') args, _ = p.parse_known_args(argv) for override in args.project_override or (): 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 ead01e75fb..f148514593 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 @@ -1211,18 +1211,6 @@ "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", "collect", "--swarming", @@ -1232,14 +1220,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1" ], - "cwd": "[START_DIR]", "name": "ct-nanobench-1", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>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,18 +1345,6 @@ "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", "collect", "--swarming", @@ -1379,14 +1354,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2" ], - "cwd": "[START_DIR]", "name": "ct-nanobench-2", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>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@ {@@@", @@ -1505,18 +1479,6 @@ "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", "collect", "--swarming", @@ -1526,14 +1488,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3" ], - "cwd": "[START_DIR]", "name": "ct-nanobench-3", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>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@ {@@@", @@ -1652,18 +1613,6 @@ "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", "collect", "--swarming", @@ -1673,14 +1622,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4" ], - "cwd": "[START_DIR]", "name": "ct-nanobench-4", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>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@ {@@@", @@ -1799,18 +1747,6 @@ "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", "collect", "--swarming", @@ -1820,14 +1756,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5" ], - "cwd": "[START_DIR]", "name": "ct-nanobench-5", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>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 1db16ebbcb..2cb7ff516d 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 @@ -1211,18 +1211,6 @@ "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", "collect", "--swarming", @@ -1232,14 +1220,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-1" ], - "cwd": "[START_DIR]", "name": "ct-dm-1", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>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@ {@@@", @@ -1289,18 +1276,6 @@ "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", "collect", "--swarming", @@ -1310,14 +1285,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-2" ], - "cwd": "[START_DIR]", "name": "ct-dm-2", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>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@ {@@@", @@ -1367,18 +1341,6 @@ "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", "collect", "--swarming", @@ -1388,14 +1350,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-3" ], - "cwd": "[START_DIR]", "name": "ct-dm-3", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>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@ {@@@", @@ -1445,18 +1406,6 @@ "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", "collect", "--swarming", @@ -1466,14 +1415,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-4" ], - "cwd": "[START_DIR]", "name": "ct-dm-4", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>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@ {@@@", @@ -1523,18 +1471,6 @@ "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", "collect", "--swarming", @@ -1544,14 +1480,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-5" ], - "cwd": "[START_DIR]", "name": "ct-dm-5", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>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 ed443e8e69..0a0363387e 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 @@ -1211,18 +1211,6 @@ "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", "collect", "--swarming", @@ -1232,14 +1220,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-1" ], - "cwd": "[START_DIR]", "name": "ct-dm-1", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>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@ {@@@", @@ -1289,18 +1276,6 @@ "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", "collect", "--swarming", @@ -1310,14 +1285,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-2" ], - "cwd": "[START_DIR]", "name": "ct-dm-2", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>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@ {@@@", @@ -1367,18 +1341,6 @@ "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", "collect", "--swarming", @@ -1388,14 +1350,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-3" ], - "cwd": "[START_DIR]", "name": "ct-dm-3", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>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@ {@@@", @@ -1445,18 +1406,6 @@ "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", "collect", "--swarming", @@ -1466,14 +1415,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-4" ], - "cwd": "[START_DIR]", "name": "ct-dm-4", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>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@ {@@@", @@ -1523,18 +1471,6 @@ "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", "collect", "--swarming", @@ -1544,14 +1480,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-5" ], - "cwd": "[START_DIR]", "name": "ct-dm-5", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>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 5dd02eabf7..0e3ecb40ce 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 @@ -1235,18 +1235,6 @@ "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", "collect", "--swarming", @@ -1256,14 +1244,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-1" ], - "cwd": "[START_DIR]", "name": "ct-dm-1", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>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@ {@@@", @@ -1313,18 +1300,6 @@ "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", "collect", "--swarming", @@ -1334,14 +1309,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-2" ], - "cwd": "[START_DIR]", "name": "ct-dm-2", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>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@ {@@@", @@ -1391,18 +1365,6 @@ "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", "collect", "--swarming", @@ -1412,14 +1374,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-3" ], - "cwd": "[START_DIR]", "name": "ct-dm-3", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>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,18 +1430,6 @@ "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", "collect", "--swarming", @@ -1490,14 +1439,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-4" ], - "cwd": "[START_DIR]", "name": "ct-dm-4", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>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@ {@@@", @@ -1547,18 +1495,6 @@ "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", "collect", "--swarming", @@ -1568,14 +1504,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-5" ], - "cwd": "[START_DIR]", "name": "ct-dm-5", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>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 c9e5f0db8e..1c12f21f1f 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 @@ -1211,18 +1211,6 @@ "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", "collect", "--swarming", @@ -1232,14 +1220,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-1" ], - "cwd": "[START_DIR]", "name": "ct-dm-1", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>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@ {@@@", @@ -1289,18 +1276,6 @@ "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", "collect", "--swarming", @@ -1310,14 +1285,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-2" ], - "cwd": "[START_DIR]", "name": "ct-dm-2", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>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@ {@@@", @@ -1367,18 +1341,6 @@ "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", "collect", "--swarming", @@ -1388,14 +1350,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-3" ], - "cwd": "[START_DIR]", "name": "ct-dm-3", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>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@ {@@@", @@ -1445,18 +1406,6 @@ "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", "collect", "--swarming", @@ -1466,14 +1415,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-4" ], - "cwd": "[START_DIR]", "name": "ct-dm-4", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>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@ {@@@", @@ -1523,18 +1471,6 @@ "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", "collect", "--swarming", @@ -1544,14 +1480,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-5" ], - "cwd": "[START_DIR]", "name": "ct-dm-5", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>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 7e443f6ece..ce91cc799b 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 @@ -1211,18 +1211,6 @@ "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", "collect", "--swarming", @@ -1232,15 +1220,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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-1" ], - "cwd": "[START_DIR]", "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@@@", - "@@@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@ {@@@", @@ -1293,18 +1280,6 @@ "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", "collect", "--swarming", @@ -1314,14 +1289,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-2" ], - "cwd": "[START_DIR]", "name": "ct-dm-2", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>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@ {@@@", @@ -1371,18 +1345,6 @@ "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", "collect", "--swarming", @@ -1392,15 +1354,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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-3" ], - "cwd": "[START_DIR]", "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@@@", - "@@@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@ {@@@", @@ -1453,18 +1414,6 @@ "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", "collect", "--swarming", @@ -1474,14 +1423,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-4" ], - "cwd": "[START_DIR]", "name": "ct-dm-4", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>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@ {@@@", @@ -1531,18 +1479,6 @@ "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", "collect", "--swarming", @@ -1552,14 +1488,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-5" ], - "cwd": "[START_DIR]", "name": "ct-dm-5", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>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 c2ebcd0482..f2dcb1163e 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 @@ -1211,18 +1211,6 @@ "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", "collect", "--swarming", @@ -1232,14 +1220,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-1" ], - "cwd": "[START_DIR]", "name": "ct-dm-1", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>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@ {@@@", @@ -1289,18 +1276,6 @@ "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", "collect", "--swarming", @@ -1310,14 +1285,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-2" ], - "cwd": "[START_DIR]", "name": "ct-dm-2", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>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@ {@@@", @@ -1367,18 +1341,6 @@ "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", "collect", "--swarming", @@ -1388,15 +1350,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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-3" ], - "cwd": "[START_DIR]", "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@@@", - "@@@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@ {@@@", @@ -1449,18 +1410,6 @@ "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", "collect", "--swarming", @@ -1470,14 +1419,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-4" ], - "cwd": "[START_DIR]", "name": "ct-dm-4", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>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@ {@@@", @@ -1527,18 +1475,6 @@ "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", "collect", "--swarming", @@ -1548,14 +1484,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-5" ], - "cwd": "[START_DIR]", "name": "ct-dm-5", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>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 2b3ae236b4..f79abc71b2 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 @@ -1226,18 +1226,6 @@ "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", "collect", "--swarming", @@ -1247,14 +1235,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1" ], - "cwd": "[START_DIR]", "name": "ct-nanobench-1", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>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,18 +1360,6 @@ "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", "collect", "--swarming", @@ -1394,14 +1369,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2" ], - "cwd": "[START_DIR]", "name": "ct-nanobench-2", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>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@ {@@@", @@ -1520,18 +1494,6 @@ "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", "collect", "--swarming", @@ -1541,14 +1503,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3" ], - "cwd": "[START_DIR]", "name": "ct-nanobench-3", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>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@ {@@@", @@ -1667,18 +1628,6 @@ "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", "collect", "--swarming", @@ -1688,14 +1637,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4" ], - "cwd": "[START_DIR]", "name": "ct-nanobench-4", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>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@ {@@@", @@ -1814,18 +1762,6 @@ "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", "collect", "--swarming", @@ -1835,14 +1771,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5" ], - "cwd": "[START_DIR]", "name": "ct-nanobench-5", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>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 7da69c3ffa..456e8eb912 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 @@ -1226,18 +1226,6 @@ "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", "collect", "--swarming", @@ -1247,14 +1235,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1" ], - "cwd": "[START_DIR]", "name": "ct-nanobench-1", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>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,18 +1360,6 @@ "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", "collect", "--swarming", @@ -1394,14 +1369,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2" ], - "cwd": "[START_DIR]", "name": "ct-nanobench-2", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>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@ {@@@", @@ -1520,18 +1494,6 @@ "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", "collect", "--swarming", @@ -1541,14 +1503,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3" ], - "cwd": "[START_DIR]", "name": "ct-nanobench-3", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>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@ {@@@", @@ -1667,18 +1628,6 @@ "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", "collect", "--swarming", @@ -1688,14 +1637,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4" ], - "cwd": "[START_DIR]", "name": "ct-nanobench-4", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>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@ {@@@", @@ -1814,18 +1762,6 @@ "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", "collect", "--swarming", @@ -1835,14 +1771,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5" ], - "cwd": "[START_DIR]", "name": "ct-nanobench-5", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>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 295b026562..be747afb0c 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 @@ -1211,18 +1211,6 @@ "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", "collect", "--swarming", @@ -1232,14 +1220,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-1" ], - "cwd": "[START_DIR]", "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@{}@@@", - "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1289,18 +1276,6 @@ "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", "collect", "--swarming", @@ -1310,14 +1285,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-2" ], - "cwd": "[START_DIR]", "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@{}@@@", - "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1367,18 +1341,6 @@ "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", "collect", "--swarming", @@ -1388,14 +1350,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-3" ], - "cwd": "[START_DIR]", "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@{}@@@", - "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1445,18 +1406,6 @@ "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", "collect", "--swarming", @@ -1466,14 +1415,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-4" ], - "cwd": "[START_DIR]", "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@{}@@@", - "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1523,18 +1471,6 @@ "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", "collect", "--swarming", @@ -1544,14 +1480,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-5" ], - "cwd": "[START_DIR]", "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@{}@@@", - "@@@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 271bcfaa52..9235c24c18 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 @@ -1211,18 +1211,6 @@ "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", "collect", "--swarming", @@ -1232,14 +1220,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-1" ], - "cwd": "[START_DIR]", "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@{}@@@", - "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1289,18 +1276,6 @@ "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", "collect", "--swarming", @@ -1310,14 +1285,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-2" ], - "cwd": "[START_DIR]", "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@{}@@@", - "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1367,18 +1341,6 @@ "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", "collect", "--swarming", @@ -1388,14 +1350,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-3" ], - "cwd": "[START_DIR]", "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@{}@@@", - "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1445,18 +1406,6 @@ "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", "collect", "--swarming", @@ -1466,14 +1415,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-4" ], - "cwd": "[START_DIR]", "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@{}@@@", - "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1523,18 +1471,6 @@ "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", "collect", "--swarming", @@ -1544,14 +1480,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-5" ], - "cwd": "[START_DIR]", "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@{}@@@", - "@@@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 c045923f23..f8b4dacd4b 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 @@ -1245,18 +1245,6 @@ "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", "collect", "--swarming", @@ -1266,14 +1254,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-1" ], - "cwd": "[START_DIR]", "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@{}@@@", - "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1323,18 +1310,6 @@ "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", "collect", "--swarming", @@ -1344,14 +1319,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-2" ], - "cwd": "[START_DIR]", "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@{}@@@", - "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1401,18 +1375,6 @@ "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", "collect", "--swarming", @@ -1422,14 +1384,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-3" ], - "cwd": "[START_DIR]", "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@{}@@@", - "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1479,18 +1440,6 @@ "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", "collect", "--swarming", @@ -1500,14 +1449,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-4" ], - "cwd": "[START_DIR]", "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@{}@@@", - "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1557,18 +1505,6 @@ "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", "collect", "--swarming", @@ -1578,14 +1514,13 @@ "--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" + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-5" ], - "cwd": "[START_DIR]", "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@{}@@@", - "@@@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/config/recipes.cfg b/infra/config/recipes.cfg index 6f851c1cb3..97cba0ab34 100644 --- a/infra/config/recipes.cfg +++ b/infra/config/recipes.cfg @@ -15,7 +15,7 @@ { "branch": "master", "project_id": "build", - "revision": "06e6b3accc66f6c31053055c8e0efcd978f18b03", + "revision": "f7b41106d64b6517c67343f2cfb03f4a9d62afc2", "url": "https://chromium.googlesource.com/chromium/tools/build.git" }, { |