diff options
author | 2018-06-08 12:37:53 -0400 | |
---|---|---|
committer | 2018-06-08 21:14:02 +0000 | |
commit | e8b38ab432faf419a6cc092082c34c233800ccea (patch) | |
tree | 91fde8ab3aceff3dbbe6d2f91d32bd515acd6023 /infra/bots/recipes/ct_skps.expected | |
parent | 4462c048f353d1c7b74ffd744dc0e27b7f89dac7 (diff) |
[recipes] Make ct_skps use binaries from a build task
Bug: skia:6473
Change-Id: I10a169dd47cb76839fd401254eaeb4c46b2ece8f
Reviewed-on: https://skia-review.googlesource.com/128549
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
Diffstat (limited to 'infra/bots/recipes/ct_skps.expected')
12 files changed, 108 insertions, 1070 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 f80f40c73d..9b30a903b4 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 @@ -116,92 +116,11 @@ "--json-output", "/path/to/tmp/json", "copy", - "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/clang_linux/VERSION", - "/path/to/tmp/" + "[START_DIR]/build/nanobench", + "[CUSTOM_/_B_WORK]/skia/infra/bots/ct/nanobench" ], "infra_step": true, - "name": "Get clang_linux VERSION" - }, - { - "cmd": [ - "python", - "-u", - "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "fetch-gn" - }, - { - "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", - "gen", - "[START_DIR]/build/out/Release", - "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-static-libstdc++\", \"-static-libgcc\"] is_debug=false" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "name": "gn gen" - }, - { - "cmd": [ - "ninja", - "-k", - "0", - "-C", - "[START_DIR]/build/out/Release" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "name": "ninja" - }, - { - "cmd": [ - "python", - "-u", - "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", - "[START_DIR]/build/out/Release", - "[CUSTOM_/_B_WORK]/skia/infra/bots/ct" - ], - "infra_step": true, - "name": "copy build products", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@import errno@@@", - "@@@STEP_LOG_LINE@python.inline@import glob@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import shutil@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@src = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@dst = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@build_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ os.makedirs(dst)@@@", - "@@@STEP_LOG_LINE@python.inline@except OSError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ if e.errno != errno.EEXIST:@@@", - "@@@STEP_LOG_LINE@python.inline@ raise@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@for pattern in build_products_whitelist:@@@", - "@@@STEP_LOG_LINE@python.inline@ path = os.path.join(src, pattern)@@@", - "@@@STEP_LOG_LINE@python.inline@ for f in glob.glob(path):@@@", - "@@@STEP_LOG_LINE@python.inline@ dst_path = os.path.join(dst, os.path.relpath(f, src))@@@", - "@@@STEP_LOG_LINE@python.inline@ if not os.path.isdir(os.path.dirname(dst_path)):@@@", - "@@@STEP_LOG_LINE@python.inline@ os.makedirs(os.path.dirname(dst_path))@@@", - "@@@STEP_LOG_LINE@python.inline@ print 'Copying build product %s to %s' % (f, dst_path)@@@", - "@@@STEP_LOG_LINE@python.inline@ shutil.move(f, dst_path)@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "copy nanobench" }, { "cmd": [ @@ -465,7 +384,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -541,7 +460,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -617,7 +536,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -693,7 +612,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -769,7 +688,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, 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 1b714c8e94..27bea2ee2c 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 @@ -116,92 +116,11 @@ "--json-output", "/path/to/tmp/json", "copy", - "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/clang_linux/VERSION", - "/path/to/tmp/" + "[START_DIR]/build/dm", + "[CUSTOM_/_B_WORK]/skia/infra/bots/ct/dm" ], "infra_step": true, - "name": "Get clang_linux VERSION" - }, - { - "cmd": [ - "python", - "-u", - "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "fetch-gn" - }, - { - "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", - "gen", - "[START_DIR]/build/out/Debug", - "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\", \"-O1\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-static-libstdc++\", \"-static-libgcc\"]" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "name": "gn gen" - }, - { - "cmd": [ - "ninja", - "-k", - "0", - "-C", - "[START_DIR]/build/out/Debug" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "name": "ninja" - }, - { - "cmd": [ - "python", - "-u", - "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", - "[START_DIR]/build/out/Debug", - "[CUSTOM_/_B_WORK]/skia/infra/bots/ct" - ], - "infra_step": true, - "name": "copy build products", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@import errno@@@", - "@@@STEP_LOG_LINE@python.inline@import glob@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import shutil@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@src = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@dst = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@build_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ os.makedirs(dst)@@@", - "@@@STEP_LOG_LINE@python.inline@except OSError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ if e.errno != errno.EEXIST:@@@", - "@@@STEP_LOG_LINE@python.inline@ raise@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@for pattern in build_products_whitelist:@@@", - "@@@STEP_LOG_LINE@python.inline@ path = os.path.join(src, pattern)@@@", - "@@@STEP_LOG_LINE@python.inline@ for f in glob.glob(path):@@@", - "@@@STEP_LOG_LINE@python.inline@ dst_path = os.path.join(dst, os.path.relpath(f, src))@@@", - "@@@STEP_LOG_LINE@python.inline@ if not os.path.isdir(os.path.dirname(dst_path)):@@@", - "@@@STEP_LOG_LINE@python.inline@ os.makedirs(os.path.dirname(dst_path))@@@", - "@@@STEP_LOG_LINE@python.inline@ print 'Copying build product %s to %s' % (f, dst_path)@@@", - "@@@STEP_LOG_LINE@python.inline@ shutil.move(f, dst_path)@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "copy dm" }, { "cmd": [ @@ -465,7 +384,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -541,7 +460,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -617,7 +536,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -693,7 +612,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -769,7 +688,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, 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 7eb65033ac..4c932cf09b 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 @@ -116,92 +116,11 @@ "--json-output", "/path/to/tmp/json", "copy", - "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/clang_linux/VERSION", - "/path/to/tmp/" + "[START_DIR]/build/dm", + "[CUSTOM_/_B_WORK]/skia/infra/bots/ct/dm" ], "infra_step": true, - "name": "Get clang_linux VERSION" - }, - { - "cmd": [ - "python", - "-u", - "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "fetch-gn" - }, - { - "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", - "gen", - "[START_DIR]/build/out/Debug", - "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\", \"-O1\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-static-libstdc++\", \"-static-libgcc\"]" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "name": "gn gen" - }, - { - "cmd": [ - "ninja", - "-k", - "0", - "-C", - "[START_DIR]/build/out/Debug" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "name": "ninja" - }, - { - "cmd": [ - "python", - "-u", - "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", - "[START_DIR]/build/out/Debug", - "[CUSTOM_/_B_WORK]/skia/infra/bots/ct" - ], - "infra_step": true, - "name": "copy build products", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@import errno@@@", - "@@@STEP_LOG_LINE@python.inline@import glob@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import shutil@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@src = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@dst = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@build_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ os.makedirs(dst)@@@", - "@@@STEP_LOG_LINE@python.inline@except OSError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ if e.errno != errno.EEXIST:@@@", - "@@@STEP_LOG_LINE@python.inline@ raise@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@for pattern in build_products_whitelist:@@@", - "@@@STEP_LOG_LINE@python.inline@ path = os.path.join(src, pattern)@@@", - "@@@STEP_LOG_LINE@python.inline@ for f in glob.glob(path):@@@", - "@@@STEP_LOG_LINE@python.inline@ dst_path = os.path.join(dst, os.path.relpath(f, src))@@@", - "@@@STEP_LOG_LINE@python.inline@ if not os.path.isdir(os.path.dirname(dst_path)):@@@", - "@@@STEP_LOG_LINE@python.inline@ os.makedirs(os.path.dirname(dst_path))@@@", - "@@@STEP_LOG_LINE@python.inline@ print 'Copying build product %s to %s' % (f, dst_path)@@@", - "@@@STEP_LOG_LINE@python.inline@ shutil.move(f, dst_path)@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "copy dm" }, { "cmd": [ @@ -465,7 +384,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -541,7 +460,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -617,7 +536,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -693,7 +612,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -769,7 +688,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, 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 ee3d138177..ec19d7dc82 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 @@ -49,7 +49,7 @@ "--output_json", "/path/to/tmp/json", "--revision", - "skia@origin/master" + "skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]", "env_prefixes": { @@ -64,7 +64,7 @@ "@@@STEP_LOG_LINE@json.output@{@@@", "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@", "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia\": \"origin/master\"@@@", + "@@@STEP_LOG_LINE@json.output@ \"skia\": \"abc123\"@@@", "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"skia\": {@@@", @@ -120,92 +120,11 @@ "--json-output", "/path/to/tmp/json", "copy", - "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/clang_linux/VERSION", - "/path/to/tmp/" + "[START_DIR]/build/dm", + "[CUSTOM_/_B_WORK]/skia/infra/bots/ct/dm" ], "infra_step": true, - "name": "Get clang_linux VERSION" - }, - { - "cmd": [ - "python", - "-u", - "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "fetch-gn" - }, - { - "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", - "gen", - "[START_DIR]/build/out/Debug", - "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\", \"-O1\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-static-libstdc++\", \"-static-libgcc\"]" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "name": "gn gen" - }, - { - "cmd": [ - "ninja", - "-k", - "0", - "-C", - "[START_DIR]/build/out/Debug" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "name": "ninja" - }, - { - "cmd": [ - "python", - "-u", - "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", - "[START_DIR]/build/out/Debug", - "[CUSTOM_/_B_WORK]/skia/infra/bots/ct" - ], - "infra_step": true, - "name": "copy build products", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@import errno@@@", - "@@@STEP_LOG_LINE@python.inline@import glob@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import shutil@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@src = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@dst = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@build_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ os.makedirs(dst)@@@", - "@@@STEP_LOG_LINE@python.inline@except OSError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ if e.errno != errno.EEXIST:@@@", - "@@@STEP_LOG_LINE@python.inline@ raise@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@for pattern in build_products_whitelist:@@@", - "@@@STEP_LOG_LINE@python.inline@ path = os.path.join(src, pattern)@@@", - "@@@STEP_LOG_LINE@python.inline@ for f in glob.glob(path):@@@", - "@@@STEP_LOG_LINE@python.inline@ dst_path = os.path.join(dst, os.path.relpath(f, src))@@@", - "@@@STEP_LOG_LINE@python.inline@ if not os.path.isdir(os.path.dirname(dst_path)):@@@", - "@@@STEP_LOG_LINE@python.inline@ os.makedirs(os.path.dirname(dst_path))@@@", - "@@@STEP_LOG_LINE@python.inline@ print 'Copying build product %s to %s' % (f, dst_path)@@@", - "@@@STEP_LOG_LINE@python.inline@ shutil.move(f, dst_path)@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "copy dm" }, { "cmd": [ @@ -469,7 +388,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -545,7 +464,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -621,7 +540,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -697,7 +616,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -773,7 +692,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -872,6 +791,8 @@ "--tag", "os:Ubuntu-14.04", "--tag", + "revision:abc123", + "--tag", "slavename:test_bot", "--tag", "stepname:ct-dm-1", @@ -944,6 +865,8 @@ "--tag", "os:Ubuntu-14.04", "--tag", + "revision:abc123", + "--tag", "slavename:test_bot", "--tag", "stepname:ct-dm-2", @@ -1016,6 +939,8 @@ "--tag", "os:Ubuntu-14.04", "--tag", + "revision:abc123", + "--tag", "slavename:test_bot", "--tag", "stepname:ct-dm-3", @@ -1088,6 +1013,8 @@ "--tag", "os:Ubuntu-14.04", "--tag", + "revision:abc123", + "--tag", "slavename:test_bot", "--tag", "stepname:ct-dm-4", @@ -1160,6 +1087,8 @@ "--tag", "os:Ubuntu-14.04", "--tag", + "revision:abc123", + "--tag", "slavename:test_bot", "--tag", "stepname:ct-dm-5", 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 9fba5cf8ce..c3a4302b9d 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 @@ -116,92 +116,11 @@ "--json-output", "/path/to/tmp/json", "copy", - "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/clang_linux/VERSION", - "/path/to/tmp/" + "[START_DIR]/build/dm", + "[CUSTOM_/_B_WORK]/skia/infra/bots/ct/dm" ], "infra_step": true, - "name": "Get clang_linux VERSION" - }, - { - "cmd": [ - "python", - "-u", - "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "fetch-gn" - }, - { - "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", - "gen", - "[START_DIR]/build/out/Debug", - "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\", \"-O1\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-static-libstdc++\", \"-static-libgcc\"]" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "name": "gn gen" - }, - { - "cmd": [ - "ninja", - "-k", - "0", - "-C", - "[START_DIR]/build/out/Debug" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "name": "ninja" - }, - { - "cmd": [ - "python", - "-u", - "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", - "[START_DIR]/build/out/Debug", - "[CUSTOM_/_B_WORK]/skia/infra/bots/ct" - ], - "infra_step": true, - "name": "copy build products", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@import errno@@@", - "@@@STEP_LOG_LINE@python.inline@import glob@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import shutil@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@src = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@dst = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@build_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ os.makedirs(dst)@@@", - "@@@STEP_LOG_LINE@python.inline@except OSError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ if e.errno != errno.EEXIST:@@@", - "@@@STEP_LOG_LINE@python.inline@ raise@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@for pattern in build_products_whitelist:@@@", - "@@@STEP_LOG_LINE@python.inline@ path = os.path.join(src, pattern)@@@", - "@@@STEP_LOG_LINE@python.inline@ for f in glob.glob(path):@@@", - "@@@STEP_LOG_LINE@python.inline@ dst_path = os.path.join(dst, os.path.relpath(f, src))@@@", - "@@@STEP_LOG_LINE@python.inline@ if not os.path.isdir(os.path.dirname(dst_path)):@@@", - "@@@STEP_LOG_LINE@python.inline@ os.makedirs(os.path.dirname(dst_path))@@@", - "@@@STEP_LOG_LINE@python.inline@ print 'Copying build product %s to %s' % (f, dst_path)@@@", - "@@@STEP_LOG_LINE@python.inline@ shutil.move(f, dst_path)@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "copy dm" }, { "cmd": [ @@ -465,7 +384,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -541,7 +460,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -617,7 +536,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -693,7 +612,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -769,7 +688,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, 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 c7f07cc719..e51b141bf1 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 @@ -116,92 +116,11 @@ "--json-output", "/path/to/tmp/json", "copy", - "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/clang_linux/VERSION", - "/path/to/tmp/" + "[START_DIR]/build/dm", + "[CUSTOM_/_B_WORK]/skia/infra/bots/ct/dm" ], "infra_step": true, - "name": "Get clang_linux VERSION" - }, - { - "cmd": [ - "python", - "-u", - "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "fetch-gn" - }, - { - "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", - "gen", - "[START_DIR]/build/out/Debug", - "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\", \"-O1\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-static-libstdc++\", \"-static-libgcc\"]" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "name": "gn gen" - }, - { - "cmd": [ - "ninja", - "-k", - "0", - "-C", - "[START_DIR]/build/out/Debug" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "name": "ninja" - }, - { - "cmd": [ - "python", - "-u", - "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", - "[START_DIR]/build/out/Debug", - "[CUSTOM_/_B_WORK]/skia/infra/bots/ct" - ], - "infra_step": true, - "name": "copy build products", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@import errno@@@", - "@@@STEP_LOG_LINE@python.inline@import glob@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import shutil@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@src = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@dst = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@build_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ os.makedirs(dst)@@@", - "@@@STEP_LOG_LINE@python.inline@except OSError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ if e.errno != errno.EEXIST:@@@", - "@@@STEP_LOG_LINE@python.inline@ raise@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@for pattern in build_products_whitelist:@@@", - "@@@STEP_LOG_LINE@python.inline@ path = os.path.join(src, pattern)@@@", - "@@@STEP_LOG_LINE@python.inline@ for f in glob.glob(path):@@@", - "@@@STEP_LOG_LINE@python.inline@ dst_path = os.path.join(dst, os.path.relpath(f, src))@@@", - "@@@STEP_LOG_LINE@python.inline@ if not os.path.isdir(os.path.dirname(dst_path)):@@@", - "@@@STEP_LOG_LINE@python.inline@ os.makedirs(os.path.dirname(dst_path))@@@", - "@@@STEP_LOG_LINE@python.inline@ print 'Copying build product %s to %s' % (f, dst_path)@@@", - "@@@STEP_LOG_LINE@python.inline@ shutil.move(f, dst_path)@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "copy dm" }, { "cmd": [ @@ -465,7 +384,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -541,7 +460,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -617,7 +536,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -693,7 +612,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -769,7 +688,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, 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 d79549fff2..4ce63e5fc9 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 @@ -116,92 +116,11 @@ "--json-output", "/path/to/tmp/json", "copy", - "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/clang_linux/VERSION", - "/path/to/tmp/" + "[START_DIR]/build/dm", + "[CUSTOM_/_B_WORK]/skia/infra/bots/ct/dm" ], "infra_step": true, - "name": "Get clang_linux VERSION" - }, - { - "cmd": [ - "python", - "-u", - "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "fetch-gn" - }, - { - "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", - "gen", - "[START_DIR]/build/out/Debug", - "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\", \"-O1\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-static-libstdc++\", \"-static-libgcc\"]" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "name": "gn gen" - }, - { - "cmd": [ - "ninja", - "-k", - "0", - "-C", - "[START_DIR]/build/out/Debug" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "name": "ninja" - }, - { - "cmd": [ - "python", - "-u", - "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", - "[START_DIR]/build/out/Debug", - "[CUSTOM_/_B_WORK]/skia/infra/bots/ct" - ], - "infra_step": true, - "name": "copy build products", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@import errno@@@", - "@@@STEP_LOG_LINE@python.inline@import glob@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import shutil@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@src = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@dst = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@build_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ os.makedirs(dst)@@@", - "@@@STEP_LOG_LINE@python.inline@except OSError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ if e.errno != errno.EEXIST:@@@", - "@@@STEP_LOG_LINE@python.inline@ raise@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@for pattern in build_products_whitelist:@@@", - "@@@STEP_LOG_LINE@python.inline@ path = os.path.join(src, pattern)@@@", - "@@@STEP_LOG_LINE@python.inline@ for f in glob.glob(path):@@@", - "@@@STEP_LOG_LINE@python.inline@ dst_path = os.path.join(dst, os.path.relpath(f, src))@@@", - "@@@STEP_LOG_LINE@python.inline@ if not os.path.isdir(os.path.dirname(dst_path)):@@@", - "@@@STEP_LOG_LINE@python.inline@ os.makedirs(os.path.dirname(dst_path))@@@", - "@@@STEP_LOG_LINE@python.inline@ print 'Copying build product %s to %s' % (f, dst_path)@@@", - "@@@STEP_LOG_LINE@python.inline@ shutil.move(f, dst_path)@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "copy dm" }, { "cmd": [ @@ -465,7 +384,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -541,7 +460,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -617,7 +536,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -693,7 +612,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -769,7 +688,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, 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 0361c84ef9..289eb61954 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 @@ -116,92 +116,11 @@ "--json-output", "/path/to/tmp/json", "copy", - "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/clang_linux/VERSION", - "/path/to/tmp/" + "[START_DIR]/build/nanobench", + "[CUSTOM_/_B_WORK]/skia/infra/bots/ct/nanobench" ], "infra_step": true, - "name": "Get clang_linux VERSION" - }, - { - "cmd": [ - "python", - "-u", - "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "fetch-gn" - }, - { - "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", - "gen", - "[START_DIR]/build/out/Release", - "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-static-libstdc++\", \"-static-libgcc\"] is_debug=false" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "name": "gn gen" - }, - { - "cmd": [ - "ninja", - "-k", - "0", - "-C", - "[START_DIR]/build/out/Release" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "name": "ninja" - }, - { - "cmd": [ - "python", - "-u", - "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", - "[START_DIR]/build/out/Release", - "[CUSTOM_/_B_WORK]/skia/infra/bots/ct" - ], - "infra_step": true, - "name": "copy build products", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@import errno@@@", - "@@@STEP_LOG_LINE@python.inline@import glob@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import shutil@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@src = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@dst = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@build_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ os.makedirs(dst)@@@", - "@@@STEP_LOG_LINE@python.inline@except OSError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ if e.errno != errno.EEXIST:@@@", - "@@@STEP_LOG_LINE@python.inline@ raise@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@for pattern in build_products_whitelist:@@@", - "@@@STEP_LOG_LINE@python.inline@ path = os.path.join(src, pattern)@@@", - "@@@STEP_LOG_LINE@python.inline@ for f in glob.glob(path):@@@", - "@@@STEP_LOG_LINE@python.inline@ dst_path = os.path.join(dst, os.path.relpath(f, src))@@@", - "@@@STEP_LOG_LINE@python.inline@ if not os.path.isdir(os.path.dirname(dst_path)):@@@", - "@@@STEP_LOG_LINE@python.inline@ os.makedirs(os.path.dirname(dst_path))@@@", - "@@@STEP_LOG_LINE@python.inline@ print 'Copying build product %s to %s' % (f, dst_path)@@@", - "@@@STEP_LOG_LINE@python.inline@ shutil.move(f, dst_path)@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "copy nanobench" }, { "cmd": [ @@ -465,7 +384,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -541,7 +460,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -617,7 +536,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -693,7 +612,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -769,7 +688,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, 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 edc14d27e8..f0478acbe4 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 @@ -116,92 +116,11 @@ "--json-output", "/path/to/tmp/json", "copy", - "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/clang_linux/VERSION", - "/path/to/tmp/" + "[START_DIR]/build/nanobench", + "[CUSTOM_/_B_WORK]/skia/infra/bots/ct/nanobench" ], "infra_step": true, - "name": "Get clang_linux VERSION" - }, - { - "cmd": [ - "python", - "-u", - "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "fetch-gn" - }, - { - "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", - "gen", - "[START_DIR]/build/out/Release", - "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-static-libstdc++\", \"-static-libgcc\"] is_debug=false" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "name": "gn gen" - }, - { - "cmd": [ - "ninja", - "-k", - "0", - "-C", - "[START_DIR]/build/out/Release" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "name": "ninja" - }, - { - "cmd": [ - "python", - "-u", - "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", - "[START_DIR]/build/out/Release", - "[CUSTOM_/_B_WORK]/skia/infra/bots/ct" - ], - "infra_step": true, - "name": "copy build products", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@import errno@@@", - "@@@STEP_LOG_LINE@python.inline@import glob@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import shutil@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@src = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@dst = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@build_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ os.makedirs(dst)@@@", - "@@@STEP_LOG_LINE@python.inline@except OSError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ if e.errno != errno.EEXIST:@@@", - "@@@STEP_LOG_LINE@python.inline@ raise@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@for pattern in build_products_whitelist:@@@", - "@@@STEP_LOG_LINE@python.inline@ path = os.path.join(src, pattern)@@@", - "@@@STEP_LOG_LINE@python.inline@ for f in glob.glob(path):@@@", - "@@@STEP_LOG_LINE@python.inline@ dst_path = os.path.join(dst, os.path.relpath(f, src))@@@", - "@@@STEP_LOG_LINE@python.inline@ if not os.path.isdir(os.path.dirname(dst_path)):@@@", - "@@@STEP_LOG_LINE@python.inline@ os.makedirs(os.path.dirname(dst_path))@@@", - "@@@STEP_LOG_LINE@python.inline@ print 'Copying build product %s to %s' % (f, dst_path)@@@", - "@@@STEP_LOG_LINE@python.inline@ shutil.move(f, dst_path)@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "copy nanobench" }, { "cmd": [ @@ -465,7 +384,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -541,7 +460,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -617,7 +536,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -693,7 +612,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -769,7 +688,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, 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 cec9897aee..bb536177de 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 @@ -116,92 +116,11 @@ "--json-output", "/path/to/tmp/json", "copy", - "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/clang_linux/VERSION", - "/path/to/tmp/" + "[START_DIR]/build/get_images_from_skps", + "[CUSTOM_/_B_WORK]/skia/infra/bots/ct/get_images_from_skps" ], "infra_step": true, - "name": "Get clang_linux VERSION" - }, - { - "cmd": [ - "python", - "-u", - "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "fetch-gn" - }, - { - "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", - "gen", - "[START_DIR]/build/out/Debug", - "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\", \"-O1\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-static-libstdc++\", \"-static-libgcc\"]" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "name": "gn gen" - }, - { - "cmd": [ - "ninja", - "-k", - "0", - "-C", - "[START_DIR]/build/out/Debug" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "name": "ninja" - }, - { - "cmd": [ - "python", - "-u", - "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", - "[START_DIR]/build/out/Debug", - "[CUSTOM_/_B_WORK]/skia/infra/bots/ct" - ], - "infra_step": true, - "name": "copy build products", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@import errno@@@", - "@@@STEP_LOG_LINE@python.inline@import glob@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import shutil@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@src = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@dst = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@build_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ os.makedirs(dst)@@@", - "@@@STEP_LOG_LINE@python.inline@except OSError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ if e.errno != errno.EEXIST:@@@", - "@@@STEP_LOG_LINE@python.inline@ raise@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@for pattern in build_products_whitelist:@@@", - "@@@STEP_LOG_LINE@python.inline@ path = os.path.join(src, pattern)@@@", - "@@@STEP_LOG_LINE@python.inline@ for f in glob.glob(path):@@@", - "@@@STEP_LOG_LINE@python.inline@ dst_path = os.path.join(dst, os.path.relpath(f, src))@@@", - "@@@STEP_LOG_LINE@python.inline@ if not os.path.isdir(os.path.dirname(dst_path)):@@@", - "@@@STEP_LOG_LINE@python.inline@ os.makedirs(os.path.dirname(dst_path))@@@", - "@@@STEP_LOG_LINE@python.inline@ print 'Copying build product %s to %s' % (f, dst_path)@@@", - "@@@STEP_LOG_LINE@python.inline@ shutil.move(f, dst_path)@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "copy get_images_from_skps" }, { "cmd": [ @@ -465,7 +384,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -541,7 +460,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -617,7 +536,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -693,7 +612,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -769,7 +688,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, 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 9e58de4687..6458b04410 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 @@ -116,92 +116,11 @@ "--json-output", "/path/to/tmp/json", "copy", - "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/clang_linux/VERSION", - "/path/to/tmp/" + "[START_DIR]/build/get_images_from_skps", + "[CUSTOM_/_B_WORK]/skia/infra/bots/ct/get_images_from_skps" ], "infra_step": true, - "name": "Get clang_linux VERSION" - }, - { - "cmd": [ - "python", - "-u", - "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "fetch-gn" - }, - { - "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", - "gen", - "[START_DIR]/build/out/Debug", - "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\", \"-O1\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-static-libstdc++\", \"-static-libgcc\"]" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "name": "gn gen" - }, - { - "cmd": [ - "ninja", - "-k", - "0", - "-C", - "[START_DIR]/build/out/Debug" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "name": "ninja" - }, - { - "cmd": [ - "python", - "-u", - "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", - "[START_DIR]/build/out/Debug", - "[CUSTOM_/_B_WORK]/skia/infra/bots/ct" - ], - "infra_step": true, - "name": "copy build products", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@import errno@@@", - "@@@STEP_LOG_LINE@python.inline@import glob@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import shutil@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@src = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@dst = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@build_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ os.makedirs(dst)@@@", - "@@@STEP_LOG_LINE@python.inline@except OSError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ if e.errno != errno.EEXIST:@@@", - "@@@STEP_LOG_LINE@python.inline@ raise@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@for pattern in build_products_whitelist:@@@", - "@@@STEP_LOG_LINE@python.inline@ path = os.path.join(src, pattern)@@@", - "@@@STEP_LOG_LINE@python.inline@ for f in glob.glob(path):@@@", - "@@@STEP_LOG_LINE@python.inline@ dst_path = os.path.join(dst, os.path.relpath(f, src))@@@", - "@@@STEP_LOG_LINE@python.inline@ if not os.path.isdir(os.path.dirname(dst_path)):@@@", - "@@@STEP_LOG_LINE@python.inline@ os.makedirs(os.path.dirname(dst_path))@@@", - "@@@STEP_LOG_LINE@python.inline@ print 'Copying build product %s to %s' % (f, dst_path)@@@", - "@@@STEP_LOG_LINE@python.inline@ shutil.move(f, dst_path)@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "copy get_images_from_skps" }, { "cmd": [ @@ -465,7 +384,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -541,7 +460,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -617,7 +536,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -693,7 +612,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -769,7 +688,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, 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 d1c8d511af..1f063a1b01 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 @@ -120,92 +120,11 @@ "--json-output", "/path/to/tmp/json", "copy", - "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/clang_linux/VERSION", - "/path/to/tmp/" + "[START_DIR]/build/get_images_from_skps", + "[CUSTOM_/_B_WORK]/skia/infra/bots/ct/get_images_from_skps" ], "infra_step": true, - "name": "Get clang_linux VERSION" - }, - { - "cmd": [ - "python", - "-u", - "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "fetch-gn" - }, - { - "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", - "gen", - "[START_DIR]/build/out/Debug", - "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\", \"-O1\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-static-libstdc++\", \"-static-libgcc\"]" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "name": "gn gen" - }, - { - "cmd": [ - "ninja", - "-k", - "0", - "-C", - "[START_DIR]/build/out/Debug" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" - }, - "name": "ninja" - }, - { - "cmd": [ - "python", - "-u", - "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", - "[START_DIR]/build/out/Debug", - "[CUSTOM_/_B_WORK]/skia/infra/bots/ct" - ], - "infra_step": true, - "name": "copy build products", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@import errno@@@", - "@@@STEP_LOG_LINE@python.inline@import glob@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import shutil@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@src = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@dst = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@build_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ os.makedirs(dst)@@@", - "@@@STEP_LOG_LINE@python.inline@except OSError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ if e.errno != errno.EEXIST:@@@", - "@@@STEP_LOG_LINE@python.inline@ raise@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@for pattern in build_products_whitelist:@@@", - "@@@STEP_LOG_LINE@python.inline@ path = os.path.join(src, pattern)@@@", - "@@@STEP_LOG_LINE@python.inline@ for f in glob.glob(path):@@@", - "@@@STEP_LOG_LINE@python.inline@ dst_path = os.path.join(dst, os.path.relpath(f, src))@@@", - "@@@STEP_LOG_LINE@python.inline@ if not os.path.isdir(os.path.dirname(dst_path)):@@@", - "@@@STEP_LOG_LINE@python.inline@ os.makedirs(os.path.dirname(dst_path))@@@", - "@@@STEP_LOG_LINE@python.inline@ print 'Copying build product %s to %s' % (f, dst_path)@@@", - "@@@STEP_LOG_LINE@python.inline@ shutil.move(f, dst_path)@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "copy get_images_from_skps" }, { "cmd": [ @@ -469,7 +388,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -545,7 +464,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -621,7 +540,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -697,7 +616,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, @@ -773,7 +692,7 @@ "--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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\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 \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"abc123\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\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, |