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 /infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs.json | |
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>
Diffstat (limited to 'infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs.json')
-rw-r--r-- | infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs.json | 95 |
1 files changed, 15 insertions, 80 deletions
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@ {@@@", |