Index: infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json |
diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json |
index 3a19e4bf16c98266ceb5ec4952891273a78060c1..8cee5e74b779e1e3413a05c0785c3ff7f2bc5670 100644 |
--- a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json |
+++ b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json |
@@ -258,8 +258,7 @@ |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
"@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"dm\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"nanobench\"@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"dm\"@@@", |
"@@@STEP_LOG_LINE@json.output@ ], @@@", |
"@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", |
"@@@STEP_LOG_LINE@json.output@ \"arch\": \"x86_64\", @@@", |
@@ -276,7 +275,7 @@ |
"@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", |
"@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", |
"@@@STEP_LOG_LINE@json.output@ ], @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": true, @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", |
"@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": true, @@@", |
"@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", |
"@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0\"@@@", |
@@ -736,188 +735,6 @@ |
"cmd": [ |
"python", |
"-u", |
- "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", |
- "[SLAVE_BUILD]/swarming_temp_dir", |
- "511" |
- ], |
- "name": "makedirs swarming tmp dir (3)", |
- "~followup_annotations": [ |
- "@@@STEP_LOG_LINE@python.inline@@@@", |
- "@@@STEP_LOG_LINE@python.inline@import sys, os@@@", |
- "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@", |
- "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@", |
- "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@", |
- "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@", |
- "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@", |
- "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", |
- "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@", |
- "@@@STEP_LOG_END@python.inline@@@" |
- ] |
- }, |
- { |
- "cmd": [ |
- "python", |
- "-u", |
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
- "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/perf_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-perf_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", |
- "[SLAVE_BUILD]/swarming_temp_dir/perf_skia.isolated.gen.json" |
- ], |
- "name": "Write perf_skia.isolated.gen.json" |
- }, |
- { |
- "cmd": [ |
- "python", |
- "-u", |
- "RECIPE_MODULE[build::isolate]/resources/isolate.py", |
- "[SLAVE_BUILD]/swarming.client", |
- "batcharchive", |
- "--dump-json", |
- "/path/to/tmp/json", |
- "--isolate-server", |
- "https://isolateserver.appspot.com", |
- "--verbose", |
- "[SLAVE_BUILD]/swarming_temp_dir/perf_skia.isolated.gen.json" |
- ], |
- "name": "isolate tests (3)", |
- "~followup_annotations": [ |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"perf_skia\": \"[dummy hash for perf_skia]\"@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@", |
- "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"perf_skia\": \"[dummy hash for perf_skia]\"}@@@" |
- ] |
- }, |
- { |
- "cmd": [ |
- "python", |
- "-u", |
- "\nimport json\nimport sys\nwith open(sys.argv[1]) as f:\n isolated = json.load(f)\nif not isolated.get('includes'):\n isolated['includes'] = []\nfor h in sys.argv[2:]:\n isolated['includes'].append(h)\nwith open(sys.argv[1], 'w') as f:\n json.dump(isolated, f, sort_keys=True)\n", |
- "[SLAVE_BUILD]/swarming_temp_dir/skia-task-perf_skia.isolated", |
- "abc123" |
- ], |
- "name": "add_isolated_input (2)", |
- "~followup_annotations": [ |
- "@@@STEP_LOG_LINE@python.inline@@@@", |
- "@@@STEP_LOG_LINE@python.inline@import json@@@", |
- "@@@STEP_LOG_LINE@python.inline@import sys@@@", |
- "@@@STEP_LOG_LINE@python.inline@with open(sys.argv[1]) as f:@@@", |
- "@@@STEP_LOG_LINE@python.inline@ isolated = json.load(f)@@@", |
- "@@@STEP_LOG_LINE@python.inline@if not isolated.get('includes'):@@@", |
- "@@@STEP_LOG_LINE@python.inline@ isolated['includes'] = []@@@", |
- "@@@STEP_LOG_LINE@python.inline@for h in sys.argv[2:]:@@@", |
- "@@@STEP_LOG_LINE@python.inline@ isolated['includes'].append(h)@@@", |
- "@@@STEP_LOG_LINE@python.inline@with open(sys.argv[1], 'w') as f:@@@", |
- "@@@STEP_LOG_LINE@python.inline@ json.dump(isolated, f, sort_keys=True)@@@", |
- "@@@STEP_LOG_END@python.inline@@@" |
- ] |
- }, |
- { |
- "cmd": [ |
- "python", |
- "-u", |
- "[SLAVE_BUILD]/swarming.client/isolateserver.py", |
- "archive", |
- "--isolate-server", |
- "https://isolateserver.appspot.com", |
- "[SLAVE_BUILD]/swarming_temp_dir/skia-task-perf_skia.isolated" |
- ], |
- "name": "upload new .isolated file for perf_skia", |
- "stdout": "/path/to/tmp/" |
- }, |
- { |
- "cmd": [ |
- "python", |
- "-u", |
- "[SLAVE_BUILD]/swarming.client/swarming.py", |
- "trigger", |
- "--swarming", |
- "https://chromium-swarm.appspot.com", |
- "--isolate-server", |
- "https://isolateserver.appspot.com", |
- "--priority", |
- "90", |
- "--shards", |
- "1", |
- "--task-name", |
- "perf_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/5", |
- "--dump-json", |
- "/path/to/tmp/json", |
- "--expiration", |
- "72000", |
- "--io-timeout", |
- "2400", |
- "--hard-timeout", |
- "14400", |
- "--dimension", |
- "cpu", |
- "x86-64-avx2", |
- "--dimension", |
- "gpu", |
- "none", |
- "--dimension", |
- "os", |
- "Ubuntu", |
- "--dimension", |
- "pool", |
- "Skia", |
- "--tag", |
- "allow_milo:1", |
- "--tag", |
- "buildername:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug", |
- "--tag", |
- "buildnumber:5", |
- "--tag", |
- "data:def456", |
- "--tag", |
- "master:client.skia", |
- "--tag", |
- "name:perf_skia", |
- "--tag", |
- "os:Ubuntu", |
- "--tag", |
- "revision:abc123", |
- "--tag", |
- "slavename:skiabot-linux-swarm-000", |
- "--tag", |
- "stepname:perf_skia on Ubuntu", |
- "--cipd-package", |
- "skp:skia/bots/skp:version:0", |
- "--cipd-package", |
- "skimage:skia/bots/skimage:version:0", |
- "def456", |
- "--", |
- "--workdir", |
- "../../..", |
- "swarm_perf", |
- "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug", |
- "mastername=client.skia", |
- "buildnumber=5", |
- "slavename=skiabot-linux-swarm-000", |
- "reason=Triggered by Skia swarm_trigger Recipe", |
- "swarm_out_dir=${ISOLATED_OUTDIR}", |
- "revision=abc123" |
- ], |
- "name": "[trigger] perf_skia on Ubuntu", |
- "~followup_annotations": [ |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"perf_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/5\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"perf_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/5\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ }@@@", |
- "@@@STEP_LOG_LINE@json.output@ }@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@", |
- "@@@STEP_LINK@shard #0@https://chromium-swarm.appspot.com/user/task/10000@@@", |
- "@@@STEP_LINK@view steps on Milo@https://luci-milo.appspot.com/swarming/task/10000@@@" |
- ] |
- }, |
- { |
- "cmd": [ |
- "python", |
- "-u", |
"\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", |
"[SLAVE_BUILD]/swarming_temp_dir/outputs/test_skia" |
], |
@@ -1051,90 +868,6 @@ |
"name": "Upload DM Results" |
}, |
{ |
- "cmd": [ |
- "python", |
- "-u", |
- "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", |
- "[SLAVE_BUILD]/swarming_temp_dir/outputs/perf_skia" |
- ], |
- "env": { |
- "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" |
- }, |
- "name": "rmtree perf_skia", |
- "~followup_annotations": [ |
- "@@@STEP_LOG_LINE@python.inline@@@@", |
- "@@@STEP_LOG_LINE@python.inline@import os, sys@@@", |
- "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@", |
- "@@@STEP_LOG_LINE@python.inline@@@@", |
- "@@@STEP_LOG_LINE@python.inline@@@@", |
- "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@", |
- "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@", |
- "@@@STEP_LOG_END@python.inline@@@" |
- ] |
- }, |
- { |
- "cmd": [ |
- "python", |
- "-u", |
- "[SLAVE_BUILD]/swarming.client/swarming.py", |
- "collect", |
- "--swarming", |
- "https://chromium-swarm.appspot.com", |
- "--decorate", |
- "--print-status-updates", |
- "--json", |
- "{\"base_task_name\": \"perf_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/5\", \"tasks\": {\"perf_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/5\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", |
- "--task-summary-json", |
- "/path/to/tmp/json", |
- "--task-output-dir", |
- "[SLAVE_BUILD]/swarming_temp_dir/outputs/perf_skia" |
- ], |
- "name": "perf_skia on Ubuntu", |
- "~followup_annotations": [ |
- "@@@STEP_TEXT@swarming pending 71s@@@", |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"shards\": [@@@", |
- "@@@STEP_LOG_LINE@json.output@ {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"abandoned_ts\": null, @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"bot_id\": \"vm30\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"completed_ts\": \"2014-09-25T01:42:00.123\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"created_ts\": \"2014-09-25T01:41:00.123\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"durations\": [@@@", |
- "@@@STEP_LOG_LINE@json.output@ 5.7, @@@", |
- "@@@STEP_LOG_LINE@json.output@ 31.5@@@", |
- "@@@STEP_LOG_LINE@json.output@ ], @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"exit_codes\": [@@@", |
- "@@@STEP_LOG_LINE@json.output@ 0, @@@", |
- "@@@STEP_LOG_LINE@json.output@ 0@@@", |
- "@@@STEP_LOG_LINE@json.output@ ], @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"failure\": false, @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"id\": \"148aa78d7aa0000\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"internal_failure\": false, @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"isolated_out\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"isolated\": \"abc123\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"isolatedserver\": \"https://isolateserver.appspot.com\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"namespace\": \"default-gzip\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"blah\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ }, @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"modified_ts\": \"2014-09-25 01:42:00\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"heartbeat-canary-2014-09-25_01:41:55-os=Windows\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"outputs\": [@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"Heart beat succeeded on win32.\\n\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"Foo\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ ], @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"started_ts\": \"2014-09-25T01:42:11.123\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"state\": 112, @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"try_number\": 1, @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"user\": \"unknown\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ }@@@", |
- "@@@STEP_LOG_LINE@json.output@ ]@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@", |
- "@@@STEP_LINK@shard #0 isolated out@blah@@@", |
- "@@@STEP_LINK@view steps on Milo@https://luci-milo.appspot.com/swarming/task/148aa78d7aa0000@@@" |
- ] |
- }, |
- { |
"name": "$result", |
"recipe_result": null, |
"status_code": 0 |