From c1e9617e82a2d573c890ee17e69a3d4699800f05 Mon Sep 17 00:00:00 2001 From: Eric Boren Date: Wed, 19 Apr 2017 11:12:20 +0000 Subject: 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 > Reviewed-by: Eric Boren > 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 Commit-Queue: Eric Boren --- .../ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json | 95 ++++------------------ 1 file changed, 15 insertions(+), 80 deletions(-) (limited to 'infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json') 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 @@ -1224,18 +1224,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", @@ -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'
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 +1358,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", @@ -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'
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@ {@@@", @@ -1518,18 +1492,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", @@ -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'
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@ {@@@", @@ -1665,18 +1626,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", @@ -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'
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@ {@@@", @@ -1812,18 +1760,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", @@ -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'
swarming pending 71s@@@", - "@@@STEP_LOG_LINE@json.output@{}@@@", - "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", -- cgit v1.2.3