diff options
| author |  Eric Boren <borenet@google.com> | 2017-06-16 13:10:22 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-06-16 17:41:28 +0000 |
| commit | 3e2ffd74b57a917a4df8d64785a18cf79ff2aacd (patch) | |
| tree | 5d504bbf1beb1610b0389cfafb6174e0de564754 /infra/bots/recipes/ct_skps.expected | |
| parent | 6ecc911070add386dc9ffeb8b131d21035672fb6 (diff) | |
[recipes] Switch to file module from recipe_engine
Bug: skia:6704
Change-Id: Id3cefa643316e5676d2038a75240e16d929d6d63
Reviewed-on: https://skia-review.googlesource.com/20146
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Ravi Mistry <rmistry@google.com>
Diffstat (limited to 'infra/bots/recipes/ct_skps.expected')
12 files changed, 1002 insertions, 762 deletions
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 a5ee8619d3..22229ae91e 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 @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ @@ -353,13 +349,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/luci-go" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree luci-go" }, @@ -367,11 +362,14 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copytree", "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go", - "[START_DIR]/luci-go", - "0" + "[START_DIR]/luci-go" ], + "infra_step": true, "name": "Copy Go binary", "~followup_annotations": [ "@@@SET_BUILD_PROPERTY@Download SKPs by rank@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/\"@@@", @@ -382,13 +380,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/swarming_temp_dir" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree swarming_temp_dir" }, @@ -396,13 +393,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/slave1" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave1" }, @@ -414,6 +410,7 @@ "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/slave1", "511" ], + "infra_step": true, "name": "makedirs slave1", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -459,6 +456,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -477,23 +475,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-nanobench-1.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-nanobench-1.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/slave2" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave2" }, @@ -505,6 +506,7 @@ "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/slave2", "511" ], + "infra_step": true, "name": "makedirs slave2", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -550,6 +552,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (2)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -568,23 +571,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-nanobench-2.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-nanobench-2.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/slave3" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave3" }, @@ -596,6 +602,7 @@ "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/slave3", "511" ], + "infra_step": true, "name": "makedirs slave3", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -641,6 +648,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (3)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -659,23 +667,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-nanobench-3.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-nanobench-3.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/slave4" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave4" }, @@ -687,6 +698,7 @@ "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/slave4", "511" ], + "infra_step": true, "name": "makedirs slave4", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -732,6 +744,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (4)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -750,23 +763,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-nanobench-4.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-nanobench-4.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/slave5" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave5" }, @@ -778,6 +794,7 @@ "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/slave5", "511" ], + "infra_step": true, "name": "makedirs slave5", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -823,6 +840,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (5)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -841,17 +859,24 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-nanobench-5.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-nanobench-5.isolated.gen.json" }, { "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\"chromium_build\": \"c37e844a6f8708-eee762104c75bd\", \"num_slaves\": 5, \"page_type\": \"10k\"}", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/skps_version" ], @@ -1311,23 +1336,19 @@ "cmd": [ "python", "-u", - "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1/0", - "/path/to/tmp/json" + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "listdir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1/0" ], + "infra_step": true, "name": "listdir output dir", + "stdout": "/path/to/tmp/", "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@[@@@", - "@@@STEP_LOG_LINE@json.output@ \"file 1\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"file 2\"@@@", - "@@@STEP_LOG_LINE@json.output@]@@@", - "@@@STEP_LOG_END@json.output@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import json, os, sys@@@", - "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):@@@", - "@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[2], 'w') as f:@@@", - "@@@STEP_LOG_LINE@python.inline@ json.dump(os.listdir(sys.argv[1]), f)@@@", - "@@@STEP_LOG_END@python.inline@@@" + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1/0/file 1@@@", + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1/0/file 2@@@", + "@@@STEP_LOG_END@listdir@@@" ] }, { @@ -1457,23 +1478,19 @@ "cmd": [ "python", "-u", - "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2/0", - "/path/to/tmp/json" + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "listdir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2/0" ], + "infra_step": true, "name": "listdir output dir (2)", + "stdout": "/path/to/tmp/", "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@[@@@", - "@@@STEP_LOG_LINE@json.output@ \"file 1\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"file 2\"@@@", - "@@@STEP_LOG_LINE@json.output@]@@@", - "@@@STEP_LOG_END@json.output@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import json, os, sys@@@", - "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):@@@", - "@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[2], 'w') as f:@@@", - "@@@STEP_LOG_LINE@python.inline@ json.dump(os.listdir(sys.argv[1]), f)@@@", - "@@@STEP_LOG_END@python.inline@@@" + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2/0/file 1@@@", + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2/0/file 2@@@", + "@@@STEP_LOG_END@listdir@@@" ] }, { @@ -1603,23 +1620,19 @@ "cmd": [ "python", "-u", - "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3/0", - "/path/to/tmp/json" + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "listdir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3/0" ], + "infra_step": true, "name": "listdir output dir (3)", + "stdout": "/path/to/tmp/", "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@[@@@", - "@@@STEP_LOG_LINE@json.output@ \"file 1\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"file 2\"@@@", - "@@@STEP_LOG_LINE@json.output@]@@@", - "@@@STEP_LOG_END@json.output@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import json, os, sys@@@", - "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):@@@", - "@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[2], 'w') as f:@@@", - "@@@STEP_LOG_LINE@python.inline@ json.dump(os.listdir(sys.argv[1]), f)@@@", - "@@@STEP_LOG_END@python.inline@@@" + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3/0/file 1@@@", + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3/0/file 2@@@", + "@@@STEP_LOG_END@listdir@@@" ] }, { @@ -1749,23 +1762,19 @@ "cmd": [ "python", "-u", - "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4/0", - "/path/to/tmp/json" + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "listdir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4/0" ], + "infra_step": true, "name": "listdir output dir (4)", + "stdout": "/path/to/tmp/", "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@[@@@", - "@@@STEP_LOG_LINE@json.output@ \"file 1\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"file 2\"@@@", - "@@@STEP_LOG_LINE@json.output@]@@@", - "@@@STEP_LOG_END@json.output@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import json, os, sys@@@", - "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):@@@", - "@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[2], 'w') as f:@@@", - "@@@STEP_LOG_LINE@python.inline@ json.dump(os.listdir(sys.argv[1]), f)@@@", - "@@@STEP_LOG_END@python.inline@@@" + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4/0/file 1@@@", + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4/0/file 2@@@", + "@@@STEP_LOG_END@listdir@@@" ] }, { @@ -1895,23 +1904,19 @@ "cmd": [ "python", "-u", - "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5/0", - "/path/to/tmp/json" + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "listdir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5/0" ], + "infra_step": true, "name": "listdir output dir (5)", + "stdout": "/path/to/tmp/", "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@[@@@", - "@@@STEP_LOG_LINE@json.output@ \"file 1\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"file 2\"@@@", - "@@@STEP_LOG_LINE@json.output@]@@@", - "@@@STEP_LOG_END@json.output@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import json, os, sys@@@", - "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):@@@", - "@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[2], 'w') as f:@@@", - "@@@STEP_LOG_LINE@python.inline@ json.dump(os.listdir(sys.argv[1]), f)@@@", - "@@@STEP_LOG_END@python.inline@@@" + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5/0/file 1@@@", + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5/0/file 2@@@", + "@@@STEP_LOG_END@listdir@@@" ] }, { 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 10824bba4e..bba0420e8f 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 @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ @@ -353,13 +349,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/luci-go" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree luci-go" }, @@ -367,11 +362,14 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copytree", "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go", - "[START_DIR]/luci-go", - "0" + "[START_DIR]/luci-go" ], + "infra_step": true, "name": "Copy Go binary", "~followup_annotations": [ "@@@SET_BUILD_PROPERTY@Download SKPs by rank@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/\"@@@", @@ -382,13 +380,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/swarming_temp_dir" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree swarming_temp_dir" }, @@ -396,13 +393,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/slave1" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave1" }, @@ -414,6 +410,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/slave1", "511" ], + "infra_step": true, "name": "makedirs slave1", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -459,6 +456,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -477,23 +475,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-1.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-1.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/slave2" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave2" }, @@ -505,6 +506,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/slave2", "511" ], + "infra_step": true, "name": "makedirs slave2", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -550,6 +552,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (2)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -568,23 +571,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-2.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-2.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/slave3" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave3" }, @@ -596,6 +602,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/slave3", "511" ], + "infra_step": true, "name": "makedirs slave3", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -641,6 +648,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (3)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -659,23 +667,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-3.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-3.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/slave4" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave4" }, @@ -687,6 +698,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/slave4", "511" ], + "infra_step": true, "name": "makedirs slave4", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -732,6 +744,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (4)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -750,23 +763,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-4.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-4.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/slave5" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave5" }, @@ -778,6 +794,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/slave5", "511" ], + "infra_step": true, "name": "makedirs slave5", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -823,6 +840,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (5)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -841,17 +859,24 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-5.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-5.isolated.gen.json" }, { "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\"chromium_build\": \"c37e844a6f8708-eee762104c75bd\", \"num_slaves\": 5, \"page_type\": \"100k\"}", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/skps_version" ], 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 42e8bfb59d..fbec4f3efb 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 @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ @@ -353,13 +349,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/luci-go" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree luci-go" }, @@ -367,11 +362,14 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copytree", "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go", - "[START_DIR]/luci-go", - "0" + "[START_DIR]/luci-go" ], + "infra_step": true, "name": "Copy Go binary", "~followup_annotations": [ "@@@SET_BUILD_PROPERTY@Download SKPs by rank@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/\"@@@", @@ -382,13 +380,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/swarming_temp_dir" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree swarming_temp_dir" }, @@ -396,13 +393,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave1" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave1" }, @@ -414,6 +410,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave1", "511" ], + "infra_step": true, "name": "makedirs slave1", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -459,6 +456,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -477,23 +475,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-1.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-1.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave2" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave2" }, @@ -505,6 +506,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave2", "511" ], + "infra_step": true, "name": "makedirs slave2", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -550,6 +552,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (2)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -568,23 +571,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-2.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-2.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave3" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave3" }, @@ -596,6 +602,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave3", "511" ], + "infra_step": true, "name": "makedirs slave3", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -641,6 +648,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (3)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -659,23 +667,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-3.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-3.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave4" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave4" }, @@ -687,6 +698,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave4", "511" ], + "infra_step": true, "name": "makedirs slave4", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -732,6 +744,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (4)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -750,23 +763,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-4.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-4.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave5" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave5" }, @@ -778,6 +794,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave5", "511" ], + "infra_step": true, "name": "makedirs slave5", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -823,6 +840,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (5)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -841,17 +859,24 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-5.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-5.isolated.gen.json" }, { "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\"chromium_build\": \"c37e844a6f8708-eee762104c75bd\", \"num_slaves\": 5, \"page_type\": \"10k\"}", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/skps_version" ], 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 88afa7c550..95a9220789 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 @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ @@ -357,13 +353,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/luci-go" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree luci-go" }, @@ -371,11 +366,14 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copytree", "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go", - "[START_DIR]/luci-go", - "0" + "[START_DIR]/luci-go" ], + "infra_step": true, "name": "Copy Go binary", "~followup_annotations": [ "@@@SET_BUILD_PROPERTY@Download SKPs by rank@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/\"@@@", @@ -386,13 +384,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/swarming_temp_dir" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree swarming_temp_dir" }, @@ -400,13 +397,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave1" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave1" }, @@ -418,6 +414,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave1", "511" ], + "infra_step": true, "name": "makedirs slave1", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -463,6 +460,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -481,23 +479,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-1.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-1.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave2" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave2" }, @@ -509,6 +510,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave2", "511" ], + "infra_step": true, "name": "makedirs slave2", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -554,6 +556,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (2)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -572,23 +575,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-2.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-2.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave3" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave3" }, @@ -600,6 +606,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave3", "511" ], + "infra_step": true, "name": "makedirs slave3", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -645,6 +652,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (3)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -663,23 +671,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-3.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-3.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave4" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave4" }, @@ -691,6 +702,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave4", "511" ], + "infra_step": true, "name": "makedirs slave4", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -736,6 +748,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (4)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -754,23 +767,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-4.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-4.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave5" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave5" }, @@ -782,6 +798,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave5", "511" ], + "infra_step": true, "name": "makedirs slave5", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -827,6 +844,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (5)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -845,17 +863,24 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-5.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-5.isolated.gen.json" }, { "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\"chromium_build\": \"c37e844a6f8708-eee762104c75bd\", \"num_slaves\": 5, \"page_type\": \"10k\"}", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/skps_version" ], 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 9345f5deba..f95a572187 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 @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ @@ -353,13 +349,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/luci-go" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree luci-go" }, @@ -367,11 +362,14 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copytree", "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go", - "[START_DIR]/luci-go", - "0" + "[START_DIR]/luci-go" ], + "infra_step": true, "name": "Copy Go binary", "~followup_annotations": [ "@@@SET_BUILD_PROPERTY@Download SKPs by rank@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/\"@@@", @@ -382,13 +380,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/swarming_temp_dir" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree swarming_temp_dir" }, @@ -396,13 +393,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave1" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave1" }, @@ -414,6 +410,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave1", "511" ], + "infra_step": true, "name": "makedirs slave1", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -459,6 +456,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -477,23 +475,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-1.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-1.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave2" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave2" }, @@ -505,6 +506,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave2", "511" ], + "infra_step": true, "name": "makedirs slave2", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -550,6 +552,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (2)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -568,23 +571,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-2.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-2.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave3" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave3" }, @@ -596,6 +602,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave3", "511" ], + "infra_step": true, "name": "makedirs slave3", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -641,6 +648,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (3)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -659,23 +667,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-3.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-3.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave4" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave4" }, @@ -687,6 +698,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave4", "511" ], + "infra_step": true, "name": "makedirs slave4", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -732,6 +744,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (4)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -750,23 +763,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-4.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-4.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave5" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave5" }, @@ -778,6 +794,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave5", "511" ], + "infra_step": true, "name": "makedirs slave5", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -823,6 +840,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (5)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -841,17 +859,24 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-5.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-5.isolated.gen.json" }, { "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\"chromium_build\": \"c37e844a6f8708-eee762104c75bd\", \"num_slaves\": 5, \"page_type\": \"All\"}", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/skps_version" ], 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 81832c8daf..bc1251aac9 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 @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ @@ -353,13 +349,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/luci-go" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree luci-go" }, @@ -367,11 +362,14 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copytree", "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go", - "[START_DIR]/luci-go", - "0" + "[START_DIR]/luci-go" ], + "infra_step": true, "name": "Copy Go binary", "~followup_annotations": [ "@@@SET_BUILD_PROPERTY@Download SKPs by rank@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/\"@@@", @@ -382,13 +380,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/swarming_temp_dir" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree swarming_temp_dir" }, @@ -396,13 +393,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave1" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave1" }, @@ -414,6 +410,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave1", "511" ], + "infra_step": true, "name": "makedirs slave1", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -459,6 +456,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -477,23 +475,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-1.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-1.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave2" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave2" }, @@ -505,6 +506,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave2", "511" ], + "infra_step": true, "name": "makedirs slave2", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -550,6 +552,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (2)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -568,23 +571,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-2.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-2.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave3" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave3" }, @@ -596,6 +602,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave3", "511" ], + "infra_step": true, "name": "makedirs slave3", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -641,6 +648,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (3)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -659,23 +667,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-3.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-3.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave4" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave4" }, @@ -687,6 +698,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave4", "511" ], + "infra_step": true, "name": "makedirs slave4", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -732,6 +744,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (4)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -750,23 +763,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-4.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-4.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave5" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave5" }, @@ -778,6 +794,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave5", "511" ], + "infra_step": true, "name": "makedirs slave5", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -823,6 +840,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (5)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -841,17 +859,24 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-5.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-5.isolated.gen.json" }, { "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\"chromium_build\": \"c37e844a6f8708-eee762104c75bd\", \"num_slaves\": 5, \"page_type\": \"All\"}", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/skps_version" ], 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 06b41d8f1f..4b4b6d8d60 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 @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ @@ -353,13 +349,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/luci-go" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree luci-go" }, @@ -367,11 +362,14 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copytree", "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go", - "[START_DIR]/luci-go", - "0" + "[START_DIR]/luci-go" ], + "infra_step": true, "name": "Copy Go binary", "~followup_annotations": [ "@@@SET_BUILD_PROPERTY@Download SKPs by rank@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/\"@@@", @@ -382,13 +380,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/swarming_temp_dir" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree swarming_temp_dir" }, @@ -396,13 +393,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave1" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave1" }, @@ -414,6 +410,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave1", "511" ], + "infra_step": true, "name": "makedirs slave1", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -459,6 +456,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -477,23 +475,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-1.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-1.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave2" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave2" }, @@ -505,6 +506,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave2", "511" ], + "infra_step": true, "name": "makedirs slave2", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -550,6 +552,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (2)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -568,23 +571,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-2.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-2.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave3" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave3" }, @@ -596,6 +602,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave3", "511" ], + "infra_step": true, "name": "makedirs slave3", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -641,6 +648,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (3)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -659,23 +667,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-3.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-3.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave4" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave4" }, @@ -687,6 +698,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave4", "511" ], + "infra_step": true, "name": "makedirs slave4", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -732,6 +744,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (4)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -750,23 +763,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-4.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-4.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave5" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave5" }, @@ -778,6 +794,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave5", "511" ], + "infra_step": true, "name": "makedirs slave5", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -823,6 +840,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (5)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -841,17 +859,24 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-5.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-5.isolated.gen.json" }, { "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\"chromium_build\": \"c37e844a6f8708-eee762104c75bd\", \"num_slaves\": 5, \"page_type\": \"All\"}", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/skps_version" ], 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 2e3aca1d52..9f76dbb2c6 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 @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ @@ -353,13 +349,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/luci-go" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree luci-go" }, @@ -367,11 +362,14 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copytree", "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go", - "[START_DIR]/luci-go", - "0" + "[START_DIR]/luci-go" ], + "infra_step": true, "name": "Copy Go binary", "~followup_annotations": [ "@@@SET_BUILD_PROPERTY@Download SKPs by rank@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/\"@@@", @@ -382,13 +380,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/swarming_temp_dir" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree swarming_temp_dir" }, @@ -396,13 +393,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/slave1" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave1" }, @@ -414,6 +410,7 @@ "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/slave1", "511" ], + "infra_step": true, "name": "makedirs slave1", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -459,6 +456,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -477,23 +475,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-nanobench-1.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-nanobench-1.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/slave2" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave2" }, @@ -505,6 +506,7 @@ "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/slave2", "511" ], + "infra_step": true, "name": "makedirs slave2", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -550,6 +552,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (2)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -568,23 +571,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-nanobench-2.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-nanobench-2.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/slave3" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave3" }, @@ -596,6 +602,7 @@ "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/slave3", "511" ], + "infra_step": true, "name": "makedirs slave3", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -641,6 +648,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (3)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -659,23 +667,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-nanobench-3.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-nanobench-3.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/slave4" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave4" }, @@ -687,6 +698,7 @@ "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/slave4", "511" ], + "infra_step": true, "name": "makedirs slave4", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -732,6 +744,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (4)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -750,23 +763,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-nanobench-4.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-nanobench-4.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/slave5" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave5" }, @@ -778,6 +794,7 @@ "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/slave5", "511" ], + "infra_step": true, "name": "makedirs slave5", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -823,6 +840,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (5)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -841,17 +859,24 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-nanobench-5.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-nanobench-5.isolated.gen.json" }, { "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\"chromium_build\": \"c37e844a6f8708-eee762104c75bd\", \"num_slaves\": 5, \"page_type\": \"10k\"}", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/skps_version" ], @@ -1326,23 +1351,19 @@ "cmd": [ "python", "-u", - "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1/0", - "/path/to/tmp/json" + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "listdir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1/0" ], + "infra_step": true, "name": "listdir output dir", + "stdout": "/path/to/tmp/", "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@[@@@", - "@@@STEP_LOG_LINE@json.output@ \"file 1\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"file 2\"@@@", - "@@@STEP_LOG_LINE@json.output@]@@@", - "@@@STEP_LOG_END@json.output@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import json, os, sys@@@", - "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):@@@", - "@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[2], 'w') as f:@@@", - "@@@STEP_LOG_LINE@python.inline@ json.dump(os.listdir(sys.argv[1]), f)@@@", - "@@@STEP_LOG_END@python.inline@@@" + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1/0/file 1@@@", + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1/0/file 2@@@", + "@@@STEP_LOG_END@listdir@@@" ] }, { @@ -1472,23 +1493,19 @@ "cmd": [ "python", "-u", - "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2/0", - "/path/to/tmp/json" + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "listdir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2/0" ], + "infra_step": true, "name": "listdir output dir (2)", + "stdout": "/path/to/tmp/", "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@[@@@", - "@@@STEP_LOG_LINE@json.output@ \"file 1\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"file 2\"@@@", - "@@@STEP_LOG_LINE@json.output@]@@@", - "@@@STEP_LOG_END@json.output@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import json, os, sys@@@", - "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):@@@", - "@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[2], 'w') as f:@@@", - "@@@STEP_LOG_LINE@python.inline@ json.dump(os.listdir(sys.argv[1]), f)@@@", - "@@@STEP_LOG_END@python.inline@@@" + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2/0/file 1@@@", + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2/0/file 2@@@", + "@@@STEP_LOG_END@listdir@@@" ] }, { @@ -1618,23 +1635,19 @@ "cmd": [ "python", "-u", - "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3/0", - "/path/to/tmp/json" + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "listdir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3/0" ], + "infra_step": true, "name": "listdir output dir (3)", + "stdout": "/path/to/tmp/", "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@[@@@", - "@@@STEP_LOG_LINE@json.output@ \"file 1\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"file 2\"@@@", - "@@@STEP_LOG_LINE@json.output@]@@@", - "@@@STEP_LOG_END@json.output@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import json, os, sys@@@", - "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):@@@", - "@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[2], 'w') as f:@@@", - "@@@STEP_LOG_LINE@python.inline@ json.dump(os.listdir(sys.argv[1]), f)@@@", - "@@@STEP_LOG_END@python.inline@@@" + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3/0/file 1@@@", + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3/0/file 2@@@", + "@@@STEP_LOG_END@listdir@@@" ] }, { @@ -1764,23 +1777,19 @@ "cmd": [ "python", "-u", - "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4/0", - "/path/to/tmp/json" + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "listdir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4/0" ], + "infra_step": true, "name": "listdir output dir (4)", + "stdout": "/path/to/tmp/", "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@[@@@", - "@@@STEP_LOG_LINE@json.output@ \"file 1\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"file 2\"@@@", - "@@@STEP_LOG_LINE@json.output@]@@@", - "@@@STEP_LOG_END@json.output@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import json, os, sys@@@", - "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):@@@", - "@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[2], 'w') as f:@@@", - "@@@STEP_LOG_LINE@python.inline@ json.dump(os.listdir(sys.argv[1]), f)@@@", - "@@@STEP_LOG_END@python.inline@@@" + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4/0/file 1@@@", + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4/0/file 2@@@", + "@@@STEP_LOG_END@listdir@@@" ] }, { @@ -1910,23 +1919,19 @@ "cmd": [ "python", "-u", - "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5/0", - "/path/to/tmp/json" + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "listdir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5/0" ], + "infra_step": true, "name": "listdir output dir (5)", + "stdout": "/path/to/tmp/", "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@[@@@", - "@@@STEP_LOG_LINE@json.output@ \"file 1\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"file 2\"@@@", - "@@@STEP_LOG_LINE@json.output@]@@@", - "@@@STEP_LOG_END@json.output@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import json, os, sys@@@", - "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):@@@", - "@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[2], 'w') as f:@@@", - "@@@STEP_LOG_LINE@python.inline@ json.dump(os.listdir(sys.argv[1]), f)@@@", - "@@@STEP_LOG_END@python.inline@@@" + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5/0/file 1@@@", + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5/0/file 2@@@", + "@@@STEP_LOG_END@listdir@@@" ] }, { 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 2c0de8390d..e8439c57a5 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 @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ @@ -353,13 +349,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/luci-go" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree luci-go" }, @@ -367,11 +362,14 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copytree", "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go", - "[START_DIR]/luci-go", - "0" + "[START_DIR]/luci-go" ], + "infra_step": true, "name": "Copy Go binary", "~followup_annotations": [ "@@@SET_BUILD_PROPERTY@Download SKPs by rank@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/\"@@@", @@ -382,13 +380,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/swarming_temp_dir" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree swarming_temp_dir" }, @@ -396,13 +393,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/slave1" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave1" }, @@ -414,6 +410,7 @@ "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/slave1", "511" ], + "infra_step": true, "name": "makedirs slave1", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -459,6 +456,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -477,23 +475,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-nanobench-1.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-nanobench-1.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/slave2" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave2" }, @@ -505,6 +506,7 @@ "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/slave2", "511" ], + "infra_step": true, "name": "makedirs slave2", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -550,6 +552,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (2)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -568,23 +571,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-nanobench-2.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-nanobench-2.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/slave3" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave3" }, @@ -596,6 +602,7 @@ "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/slave3", "511" ], + "infra_step": true, "name": "makedirs slave3", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -641,6 +648,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (3)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -659,23 +667,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-nanobench-3.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-nanobench-3.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/slave4" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave4" }, @@ -687,6 +698,7 @@ "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/slave4", "511" ], + "infra_step": true, "name": "makedirs slave4", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -732,6 +744,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (4)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -750,23 +763,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-nanobench-4.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-nanobench-4.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/slave5" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave5" }, @@ -778,6 +794,7 @@ "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/slave5", "511" ], + "infra_step": true, "name": "makedirs slave5", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -823,6 +840,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (5)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -841,17 +859,24 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-nanobench-5.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-nanobench-5.isolated.gen.json" }, { "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\"chromium_build\": \"c37e844a6f8708-eee762104c75bd\", \"num_slaves\": 5, \"page_type\": \"10k\"}", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/skps_version" ], @@ -1326,23 +1351,19 @@ "cmd": [ "python", "-u", - "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1/0", - "/path/to/tmp/json" + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "listdir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1/0" ], + "infra_step": true, "name": "listdir output dir", + "stdout": "/path/to/tmp/", "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@[@@@", - "@@@STEP_LOG_LINE@json.output@ \"file 1\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"file 2\"@@@", - "@@@STEP_LOG_LINE@json.output@]@@@", - "@@@STEP_LOG_END@json.output@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import json, os, sys@@@", - "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):@@@", - "@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[2], 'w') as f:@@@", - "@@@STEP_LOG_LINE@python.inline@ json.dump(os.listdir(sys.argv[1]), f)@@@", - "@@@STEP_LOG_END@python.inline@@@" + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1/0/file 1@@@", + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1/0/file 2@@@", + "@@@STEP_LOG_END@listdir@@@" ] }, { @@ -1472,23 +1493,19 @@ "cmd": [ "python", "-u", - "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2/0", - "/path/to/tmp/json" + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "listdir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2/0" ], + "infra_step": true, "name": "listdir output dir (2)", + "stdout": "/path/to/tmp/", "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@[@@@", - "@@@STEP_LOG_LINE@json.output@ \"file 1\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"file 2\"@@@", - "@@@STEP_LOG_LINE@json.output@]@@@", - "@@@STEP_LOG_END@json.output@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import json, os, sys@@@", - "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):@@@", - "@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[2], 'w') as f:@@@", - "@@@STEP_LOG_LINE@python.inline@ json.dump(os.listdir(sys.argv[1]), f)@@@", - "@@@STEP_LOG_END@python.inline@@@" + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2/0/file 1@@@", + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2/0/file 2@@@", + "@@@STEP_LOG_END@listdir@@@" ] }, { @@ -1618,23 +1635,19 @@ "cmd": [ "python", "-u", - "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3/0", - "/path/to/tmp/json" + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "listdir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3/0" ], + "infra_step": true, "name": "listdir output dir (3)", + "stdout": "/path/to/tmp/", "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@[@@@", - "@@@STEP_LOG_LINE@json.output@ \"file 1\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"file 2\"@@@", - "@@@STEP_LOG_LINE@json.output@]@@@", - "@@@STEP_LOG_END@json.output@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import json, os, sys@@@", - "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):@@@", - "@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[2], 'w') as f:@@@", - "@@@STEP_LOG_LINE@python.inline@ json.dump(os.listdir(sys.argv[1]), f)@@@", - "@@@STEP_LOG_END@python.inline@@@" + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3/0/file 1@@@", + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3/0/file 2@@@", + "@@@STEP_LOG_END@listdir@@@" ] }, { @@ -1764,23 +1777,19 @@ "cmd": [ "python", "-u", - "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4/0", - "/path/to/tmp/json" + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "listdir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4/0" ], + "infra_step": true, "name": "listdir output dir (4)", + "stdout": "/path/to/tmp/", "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@[@@@", - "@@@STEP_LOG_LINE@json.output@ \"file 1\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"file 2\"@@@", - "@@@STEP_LOG_LINE@json.output@]@@@", - "@@@STEP_LOG_END@json.output@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import json, os, sys@@@", - "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):@@@", - "@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[2], 'w') as f:@@@", - "@@@STEP_LOG_LINE@python.inline@ json.dump(os.listdir(sys.argv[1]), f)@@@", - "@@@STEP_LOG_END@python.inline@@@" + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4/0/file 1@@@", + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4/0/file 2@@@", + "@@@STEP_LOG_END@listdir@@@" ] }, { @@ -1910,23 +1919,19 @@ "cmd": [ "python", "-u", - "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5/0", - "/path/to/tmp/json" + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "listdir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5/0" ], + "infra_step": true, "name": "listdir output dir (5)", + "stdout": "/path/to/tmp/", "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@[@@@", - "@@@STEP_LOG_LINE@json.output@ \"file 1\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"file 2\"@@@", - "@@@STEP_LOG_LINE@json.output@]@@@", - "@@@STEP_LOG_END@json.output@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import json, os, sys@@@", - "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):@@@", - "@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[2], 'w') as f:@@@", - "@@@STEP_LOG_LINE@python.inline@ json.dump(os.listdir(sys.argv[1]), f)@@@", - "@@@STEP_LOG_END@python.inline@@@" + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5/0/file 1@@@", + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5/0/file 2@@@", + "@@@STEP_LOG_END@listdir@@@" ] }, { 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 b4016a7c9a..d06d5b20b0 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 @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ @@ -353,13 +349,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/luci-go" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree luci-go" }, @@ -367,11 +362,14 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copytree", "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go", - "[START_DIR]/luci-go", - "0" + "[START_DIR]/luci-go" ], + "infra_step": true, "name": "Copy Go binary", "~followup_annotations": [ "@@@SET_BUILD_PROPERTY@Download SKPs by rank@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/\"@@@", @@ -382,13 +380,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/swarming_temp_dir" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree swarming_temp_dir" }, @@ -396,13 +393,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/slave1" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave1" }, @@ -414,6 +410,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/slave1", "511" ], + "infra_step": true, "name": "makedirs slave1", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -459,6 +456,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -477,23 +475,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-1.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-get_images_from_skps-1.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/slave2" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave2" }, @@ -505,6 +506,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/slave2", "511" ], + "infra_step": true, "name": "makedirs slave2", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -550,6 +552,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (2)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -568,23 +571,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-2.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-get_images_from_skps-2.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/slave3" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave3" }, @@ -596,6 +602,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/slave3", "511" ], + "infra_step": true, "name": "makedirs slave3", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -641,6 +648,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (3)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -659,23 +667,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-3.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-get_images_from_skps-3.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/slave4" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave4" }, @@ -687,6 +698,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/slave4", "511" ], + "infra_step": true, "name": "makedirs slave4", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -732,6 +744,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (4)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -750,23 +763,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-4.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-get_images_from_skps-4.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/slave5" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave5" }, @@ -778,6 +794,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/slave5", "511" ], + "infra_step": true, "name": "makedirs slave5", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -823,6 +840,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (5)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -841,17 +859,24 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-5.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-get_images_from_skps-5.isolated.gen.json" }, { "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\"chromium_build\": \"c37e844a6f8708-eee762104c75bd\", \"num_slaves\": 5, \"page_type\": \"100k\"}", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/skps_version" ], 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 5de1b1062b..1b01ef850f 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 @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ @@ -353,13 +349,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/luci-go" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree luci-go" }, @@ -367,11 +362,14 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copytree", "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go", - "[START_DIR]/luci-go", - "0" + "[START_DIR]/luci-go" ], + "infra_step": true, "name": "Copy Go binary", "~followup_annotations": [ "@@@SET_BUILD_PROPERTY@Download SKPs by rank@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/\"@@@", @@ -382,13 +380,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/swarming_temp_dir" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree swarming_temp_dir" }, @@ -396,13 +393,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave1" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave1" }, @@ -414,6 +410,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave1", "511" ], + "infra_step": true, "name": "makedirs slave1", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -459,6 +456,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -477,23 +475,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-1.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-get_images_from_skps-1.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave2" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave2" }, @@ -505,6 +506,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave2", "511" ], + "infra_step": true, "name": "makedirs slave2", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -550,6 +552,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (2)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -568,23 +571,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-2.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-get_images_from_skps-2.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave3" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave3" }, @@ -596,6 +602,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave3", "511" ], + "infra_step": true, "name": "makedirs slave3", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -641,6 +648,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (3)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -659,23 +667,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-3.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-get_images_from_skps-3.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave4" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave4" }, @@ -687,6 +698,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave4", "511" ], + "infra_step": true, "name": "makedirs slave4", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -732,6 +744,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (4)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -750,23 +763,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-4.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-get_images_from_skps-4.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave5" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave5" }, @@ -778,6 +794,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave5", "511" ], + "infra_step": true, "name": "makedirs slave5", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -823,6 +840,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (5)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -841,17 +859,24 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-5.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-get_images_from_skps-5.isolated.gen.json" }, { "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\"chromium_build\": \"c37e844a6f8708-eee762104c75bd\", \"num_slaves\": 5, \"page_type\": \"10k\"}", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/skps_version" ], 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 4edf4f5f24..fcf032a8a1 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 @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ @@ -357,13 +353,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/luci-go" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree luci-go" }, @@ -371,11 +366,14 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copytree", "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go", - "[START_DIR]/luci-go", - "0" + "[START_DIR]/luci-go" ], + "infra_step": true, "name": "Copy Go binary", "~followup_annotations": [ "@@@SET_BUILD_PROPERTY@Download SKPs by rank@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/\"@@@", @@ -386,13 +384,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/swarming_temp_dir" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree swarming_temp_dir" }, @@ -400,13 +397,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave1" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave1" }, @@ -418,6 +414,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave1", "511" ], + "infra_step": true, "name": "makedirs slave1", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -463,6 +460,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -481,23 +479,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-1.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-get_images_from_skps-1.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave2" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave2" }, @@ -509,6 +510,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave2", "511" ], + "infra_step": true, "name": "makedirs slave2", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -554,6 +556,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (2)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -572,23 +575,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-2.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-get_images_from_skps-2.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave3" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave3" }, @@ -600,6 +606,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave3", "511" ], + "infra_step": true, "name": "makedirs slave3", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -645,6 +652,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (3)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -663,23 +671,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-3.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-get_images_from_skps-3.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave4" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave4" }, @@ -691,6 +702,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave4", "511" ], + "infra_step": true, "name": "makedirs slave4", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -736,6 +748,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (4)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -754,23 +767,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-4.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-get_images_from_skps-4.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave5" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave5" }, @@ -782,6 +798,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave5", "511" ], + "infra_step": true, "name": "makedirs slave5", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -827,6 +844,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (5)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -845,17 +863,24 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-5.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-get_images_from_skps-5.isolated.gen.json" }, { "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\"chromium_build\": \"c37e844a6f8708-eee762104c75bd\", \"num_slaves\": 5, \"page_type\": \"10k\"}", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/skps_version" ], |