diff options
author | Eric Boren <borenet@google.com> | 2018-04-26 14:23:08 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-04-26 18:51:13 +0000 |
commit | e8615f969e92009551b70c85d1913202390e0b0d (patch) | |
tree | cdabbd4f78be6bbed4dfe6774d13b7e8f93abcc7 /infra/bots/recipes/ct_skps.expected | |
parent | 329694260c6d40ea3ef8fff45d67bbc5a35b1276 (diff) |
[recipes] Use named caches for git and workdirs
Bug: skia:
Change-Id: Iaf3d190252c9483c8b9e58a3ab0305db4173cc1c
Reviewed-on: https://skia-review.googlesource.com/123929
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Diffstat (limited to 'infra/bots/recipes/ct_skps.expected')
12 files changed, 468 insertions, 468 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 551554f81e..5e53becd75 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 @@ -9,7 +9,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]" + "[START_DIR]/cache/work" ], "infra_step": true, "name": "makedirs checkout_path" @@ -22,10 +22,10 @@ "--json-output", "/path/to/tmp/json", "remove", - "[CUSTOM_/_B_WORK]/.gclient_entries" + "[START_DIR]/cache/work/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" + "name": "remove [START_DIR]/cache/work/.gclient_entries" }, { "cmd": [ @@ -33,13 +33,13 @@ "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", - "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", + "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", "--revision_mapping_file", "{\"got_revision\": \"skia\"}", "--git-cache-dir", - "[CUSTOM_/_B_CACHE]", + "[START_DIR]/cache/git", "--cleanup-dir", "[CLEANUP]/bot_update", "--output_json", @@ -47,7 +47,7 @@ "--revision", "skia@abc123" ], - "cwd": "[CUSTOM_/_B_WORK]", + "cwd": "[START_DIR]/cache/work", "env_prefixes": { "PATH": [ "RECIPE_PACKAGE_REPO[depot_tools]" @@ -116,7 +116,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/clang_linux/VERSION", + "[START_DIR]/cache/work/skia/infra/bots/assets/clang_linux/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -126,9 +126,9 @@ "cmd": [ "python", "-u", - "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" + "[START_DIR]/cache/work/skia/bin/fetch-gn" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", @@ -140,12 +140,12 @@ }, { "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", + "[START_DIR]/cache/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", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", @@ -162,7 +162,7 @@ "-C", "[START_DIR]/build/out/Release" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", @@ -177,7 +177,7 @@ "-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', '*.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" + "[START_DIR]/cache/work/skia/infra/bots/ct" ], "infra_step": true, "name": "copy build products", @@ -318,7 +318,7 @@ "--bucket", "chromium-luci", "-d", - "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go/linux64" + "[START_DIR]/cache/work/skia/infra/bots/tools/luci-go/linux64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>" @@ -334,7 +334,7 @@ "--bucket", "chromium-luci", "-d", - "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go/mac64" + "[START_DIR]/cache/work/skia/infra/bots/tools/luci-go/mac64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>" @@ -350,7 +350,7 @@ "--bucket", "chromium-luci", "-d", - "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go/win64" + "[START_DIR]/cache/work/skia/infra/bots/tools/luci-go/win64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>" @@ -378,7 +378,7 @@ "--json-output", "/path/to/tmp/json", "copytree", - "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go", + "[START_DIR]/cache/work/skia/infra/bots/tools/luci-go", "[START_DIR]/luci-go" ], "infra_step": true, @@ -409,7 +409,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" ], "infra_step": true, "name": "rmtree slave1" @@ -424,7 +424,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" ], "infra_step": true, "name": "makedirs slave1" @@ -444,7 +444,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/8/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/9/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/10/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" ], "name": "gsutil cp" }, @@ -471,7 +471,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/work/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-nanobench-1.isolated.gen.json" ], "infra_step": true, @@ -485,7 +485,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" ], "infra_step": true, "name": "rmtree slave2" @@ -500,7 +500,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" ], "infra_step": true, "name": "makedirs slave2" @@ -520,7 +520,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/18/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/19/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/20/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" ], "name": "gsutil cp (2)" }, @@ -547,7 +547,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/work/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-nanobench-2.isolated.gen.json" ], "infra_step": true, @@ -561,7 +561,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" ], "infra_step": true, "name": "rmtree slave3" @@ -576,7 +576,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" ], "infra_step": true, "name": "makedirs slave3" @@ -596,7 +596,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/28/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/29/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/30/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" ], "name": "gsutil cp (3)" }, @@ -623,7 +623,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/work/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-nanobench-3.isolated.gen.json" ], "infra_step": true, @@ -637,7 +637,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" ], "infra_step": true, "name": "rmtree slave4" @@ -652,7 +652,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" ], "infra_step": true, "name": "makedirs slave4" @@ -672,7 +672,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/38/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/39/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/40/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" ], "name": "gsutil cp (4)" }, @@ -699,7 +699,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/work/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-nanobench-4.isolated.gen.json" ], "infra_step": true, @@ -713,7 +713,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" ], "infra_step": true, "name": "rmtree slave5" @@ -728,7 +728,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" ], "infra_step": true, "name": "makedirs slave5" @@ -748,7 +748,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/48/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/49/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/50/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" ], "name": "gsutil cp (5)" }, @@ -775,7 +775,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/work/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-nanobench-5.isolated.gen.json" ], "infra_step": true, @@ -790,10 +790,10 @@ "/path/to/tmp/json", "copy", "{\"chromium_build\": \"2b7e85eb251dc7-a3cf3659ed2c08\", \"num_slaves\": 5, \"page_type\": \"All\"}", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version" ], "infra_step": true, - "name": "Create [CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version" + "name": "Create [START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version" }, { "cmd": [ 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 de43f2dba3..af0c9d55d5 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 @@ -9,7 +9,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]" + "[START_DIR]/cache/work" ], "infra_step": true, "name": "makedirs checkout_path" @@ -22,10 +22,10 @@ "--json-output", "/path/to/tmp/json", "remove", - "[CUSTOM_/_B_WORK]/.gclient_entries" + "[START_DIR]/cache/work/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" + "name": "remove [START_DIR]/cache/work/.gclient_entries" }, { "cmd": [ @@ -33,13 +33,13 @@ "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", - "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", + "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", "--revision_mapping_file", "{\"got_revision\": \"skia\"}", "--git-cache-dir", - "[CUSTOM_/_B_CACHE]", + "[START_DIR]/cache/git", "--cleanup-dir", "[CLEANUP]/bot_update", "--output_json", @@ -47,7 +47,7 @@ "--revision", "skia@abc123" ], - "cwd": "[CUSTOM_/_B_WORK]", + "cwd": "[START_DIR]/cache/work", "env_prefixes": { "PATH": [ "RECIPE_PACKAGE_REPO[depot_tools]" @@ -116,7 +116,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/clang_linux/VERSION", + "[START_DIR]/cache/work/skia/infra/bots/assets/clang_linux/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -126,9 +126,9 @@ "cmd": [ "python", "-u", - "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" + "[START_DIR]/cache/work/skia/bin/fetch-gn" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", @@ -140,12 +140,12 @@ }, { "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", + "[START_DIR]/cache/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", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", @@ -162,7 +162,7 @@ "-C", "[START_DIR]/build/out/Debug" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", @@ -177,7 +177,7 @@ "-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', '*.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" + "[START_DIR]/cache/work/skia/infra/bots/ct" ], "infra_step": true, "name": "copy build products", @@ -318,7 +318,7 @@ "--bucket", "chromium-luci", "-d", - "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go/linux64" + "[START_DIR]/cache/work/skia/infra/bots/tools/luci-go/linux64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>" @@ -334,7 +334,7 @@ "--bucket", "chromium-luci", "-d", - "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go/mac64" + "[START_DIR]/cache/work/skia/infra/bots/tools/luci-go/mac64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>" @@ -350,7 +350,7 @@ "--bucket", "chromium-luci", "-d", - "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go/win64" + "[START_DIR]/cache/work/skia/infra/bots/tools/luci-go/win64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>" @@ -378,7 +378,7 @@ "--json-output", "/path/to/tmp/json", "copytree", - "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go", + "[START_DIR]/cache/work/skia/infra/bots/tools/luci-go", "[START_DIR]/luci-go" ], "infra_step": true, @@ -409,7 +409,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" ], "infra_step": true, "name": "rmtree slave1" @@ -424,7 +424,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" ], "infra_step": true, "name": "makedirs slave1" @@ -444,7 +444,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/8/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/9/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/10/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" ], "name": "gsutil cp" }, @@ -471,7 +471,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/work/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-1.isolated.gen.json" ], "infra_step": true, @@ -485,7 +485,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" ], "infra_step": true, "name": "rmtree slave2" @@ -500,7 +500,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" ], "infra_step": true, "name": "makedirs slave2" @@ -520,7 +520,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/18/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/19/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/20/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" ], "name": "gsutil cp (2)" }, @@ -547,7 +547,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/work/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-2.isolated.gen.json" ], "infra_step": true, @@ -561,7 +561,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" ], "infra_step": true, "name": "rmtree slave3" @@ -576,7 +576,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" ], "infra_step": true, "name": "makedirs slave3" @@ -596,7 +596,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/28/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/29/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/30/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" ], "name": "gsutil cp (3)" }, @@ -623,7 +623,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/work/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-3.isolated.gen.json" ], "infra_step": true, @@ -637,7 +637,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" ], "infra_step": true, "name": "rmtree slave4" @@ -652,7 +652,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" ], "infra_step": true, "name": "makedirs slave4" @@ -672,7 +672,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/38/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/39/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/40/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" ], "name": "gsutil cp (4)" }, @@ -699,7 +699,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/work/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-4.isolated.gen.json" ], "infra_step": true, @@ -713,7 +713,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" ], "infra_step": true, "name": "rmtree slave5" @@ -728,7 +728,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" ], "infra_step": true, "name": "makedirs slave5" @@ -748,7 +748,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/48/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/49/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/50/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" ], "name": "gsutil cp (5)" }, @@ -775,7 +775,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/work/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-5.isolated.gen.json" ], "infra_step": true, @@ -790,10 +790,10 @@ "/path/to/tmp/json", "copy", "{\"chromium_build\": \"2b7e85eb251dc7-a3cf3659ed2c08\", \"num_slaves\": 5, \"page_type\": \"All\"}", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version" ], "infra_step": true, - "name": "Create [CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version" + "name": "Create [START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version" }, { "cmd": [ 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 b13bee0509..7a37ccad26 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 @@ -9,7 +9,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]" + "[START_DIR]/cache/work" ], "infra_step": true, "name": "makedirs checkout_path" @@ -22,10 +22,10 @@ "--json-output", "/path/to/tmp/json", "remove", - "[CUSTOM_/_B_WORK]/.gclient_entries" + "[START_DIR]/cache/work/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" + "name": "remove [START_DIR]/cache/work/.gclient_entries" }, { "cmd": [ @@ -33,13 +33,13 @@ "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", - "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", + "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", "--revision_mapping_file", "{\"got_revision\": \"skia\"}", "--git-cache-dir", - "[CUSTOM_/_B_CACHE]", + "[START_DIR]/cache/git", "--cleanup-dir", "[CLEANUP]/bot_update", "--output_json", @@ -47,7 +47,7 @@ "--revision", "skia@abc123" ], - "cwd": "[CUSTOM_/_B_WORK]", + "cwd": "[START_DIR]/cache/work", "env_prefixes": { "PATH": [ "RECIPE_PACKAGE_REPO[depot_tools]" @@ -116,7 +116,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/clang_linux/VERSION", + "[START_DIR]/cache/work/skia/infra/bots/assets/clang_linux/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -126,9 +126,9 @@ "cmd": [ "python", "-u", - "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" + "[START_DIR]/cache/work/skia/bin/fetch-gn" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", @@ -140,12 +140,12 @@ }, { "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", + "[START_DIR]/cache/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", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", @@ -162,7 +162,7 @@ "-C", "[START_DIR]/build/out/Debug" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", @@ -177,7 +177,7 @@ "-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', '*.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" + "[START_DIR]/cache/work/skia/infra/bots/ct" ], "infra_step": true, "name": "copy build products", @@ -318,7 +318,7 @@ "--bucket", "chromium-luci", "-d", - "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go/linux64" + "[START_DIR]/cache/work/skia/infra/bots/tools/luci-go/linux64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>" @@ -334,7 +334,7 @@ "--bucket", "chromium-luci", "-d", - "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go/mac64" + "[START_DIR]/cache/work/skia/infra/bots/tools/luci-go/mac64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>" @@ -350,7 +350,7 @@ "--bucket", "chromium-luci", "-d", - "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go/win64" + "[START_DIR]/cache/work/skia/infra/bots/tools/luci-go/win64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>" @@ -378,7 +378,7 @@ "--json-output", "/path/to/tmp/json", "copytree", - "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go", + "[START_DIR]/cache/work/skia/infra/bots/tools/luci-go", "[START_DIR]/luci-go" ], "infra_step": true, @@ -409,7 +409,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" ], "infra_step": true, "name": "rmtree slave1" @@ -424,7 +424,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" ], "infra_step": true, "name": "makedirs slave1" @@ -444,7 +444,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/8/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/9/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/10/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" ], "name": "gsutil cp" }, @@ -471,7 +471,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/work/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-1.isolated.gen.json" ], "infra_step": true, @@ -485,7 +485,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" ], "infra_step": true, "name": "rmtree slave2" @@ -500,7 +500,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" ], "infra_step": true, "name": "makedirs slave2" @@ -520,7 +520,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/18/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/19/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/20/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" ], "name": "gsutil cp (2)" }, @@ -547,7 +547,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/work/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-2.isolated.gen.json" ], "infra_step": true, @@ -561,7 +561,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" ], "infra_step": true, "name": "rmtree slave3" @@ -576,7 +576,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" ], "infra_step": true, "name": "makedirs slave3" @@ -596,7 +596,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/28/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/29/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/30/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" ], "name": "gsutil cp (3)" }, @@ -623,7 +623,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/work/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-3.isolated.gen.json" ], "infra_step": true, @@ -637,7 +637,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" ], "infra_step": true, "name": "rmtree slave4" @@ -652,7 +652,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" ], "infra_step": true, "name": "makedirs slave4" @@ -672,7 +672,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/38/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/39/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/40/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" ], "name": "gsutil cp (4)" }, @@ -699,7 +699,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/work/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-4.isolated.gen.json" ], "infra_step": true, @@ -713,7 +713,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" ], "infra_step": true, "name": "rmtree slave5" @@ -728,7 +728,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" ], "infra_step": true, "name": "makedirs slave5" @@ -748,7 +748,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/48/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/49/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/50/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" ], "name": "gsutil cp (5)" }, @@ -775,7 +775,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/work/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-5.isolated.gen.json" ], "infra_step": true, @@ -790,10 +790,10 @@ "/path/to/tmp/json", "copy", "{\"chromium_build\": \"2b7e85eb251dc7-a3cf3659ed2c08\", \"num_slaves\": 5, \"page_type\": \"All\"}", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version" ], "infra_step": true, - "name": "Create [CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version" + "name": "Create [START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version" }, { "cmd": [ 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 27a865201e..39161cded8 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 @@ -9,7 +9,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]" + "[START_DIR]/cache/work" ], "infra_step": true, "name": "makedirs checkout_path" @@ -22,10 +22,10 @@ "--json-output", "/path/to/tmp/json", "remove", - "[CUSTOM_/_B_WORK]/.gclient_entries" + "[START_DIR]/cache/work/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" + "name": "remove [START_DIR]/cache/work/.gclient_entries" }, { "cmd": [ @@ -33,13 +33,13 @@ "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", - "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", + "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", "--revision_mapping_file", "{\"got_revision\": \"skia\"}", "--git-cache-dir", - "[CUSTOM_/_B_CACHE]", + "[START_DIR]/cache/git", "--cleanup-dir", "[CLEANUP]/bot_update", "--gerrit_repo", @@ -51,7 +51,7 @@ "--revision", "skia@origin/master" ], - "cwd": "[CUSTOM_/_B_WORK]", + "cwd": "[START_DIR]/cache/work", "env_prefixes": { "PATH": [ "RECIPE_PACKAGE_REPO[depot_tools]" @@ -120,7 +120,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/clang_linux/VERSION", + "[START_DIR]/cache/work/skia/infra/bots/assets/clang_linux/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -130,9 +130,9 @@ "cmd": [ "python", "-u", - "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" + "[START_DIR]/cache/work/skia/bin/fetch-gn" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", @@ -144,12 +144,12 @@ }, { "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", + "[START_DIR]/cache/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", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", @@ -166,7 +166,7 @@ "-C", "[START_DIR]/build/out/Debug" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", @@ -181,7 +181,7 @@ "-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', '*.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" + "[START_DIR]/cache/work/skia/infra/bots/ct" ], "infra_step": true, "name": "copy build products", @@ -322,7 +322,7 @@ "--bucket", "chromium-luci", "-d", - "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go/linux64" + "[START_DIR]/cache/work/skia/infra/bots/tools/luci-go/linux64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>" @@ -338,7 +338,7 @@ "--bucket", "chromium-luci", "-d", - "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go/mac64" + "[START_DIR]/cache/work/skia/infra/bots/tools/luci-go/mac64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>" @@ -354,7 +354,7 @@ "--bucket", "chromium-luci", "-d", - "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go/win64" + "[START_DIR]/cache/work/skia/infra/bots/tools/luci-go/win64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>" @@ -382,7 +382,7 @@ "--json-output", "/path/to/tmp/json", "copytree", - "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go", + "[START_DIR]/cache/work/skia/infra/bots/tools/luci-go", "[START_DIR]/luci-go" ], "infra_step": true, @@ -413,7 +413,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" ], "infra_step": true, "name": "rmtree slave1" @@ -428,7 +428,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" ], "infra_step": true, "name": "makedirs slave1" @@ -448,7 +448,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/8/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/9/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/10/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" ], "name": "gsutil cp" }, @@ -475,7 +475,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/work/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-1.isolated.gen.json" ], "infra_step": true, @@ -489,7 +489,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" ], "infra_step": true, "name": "rmtree slave2" @@ -504,7 +504,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" ], "infra_step": true, "name": "makedirs slave2" @@ -524,7 +524,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/18/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/19/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/20/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" ], "name": "gsutil cp (2)" }, @@ -551,7 +551,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/work/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-2.isolated.gen.json" ], "infra_step": true, @@ -565,7 +565,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" ], "infra_step": true, "name": "rmtree slave3" @@ -580,7 +580,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" ], "infra_step": true, "name": "makedirs slave3" @@ -600,7 +600,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/28/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/29/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/30/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" ], "name": "gsutil cp (3)" }, @@ -627,7 +627,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/work/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-3.isolated.gen.json" ], "infra_step": true, @@ -641,7 +641,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" ], "infra_step": true, "name": "rmtree slave4" @@ -656,7 +656,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" ], "infra_step": true, "name": "makedirs slave4" @@ -676,7 +676,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/38/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/39/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/40/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" ], "name": "gsutil cp (4)" }, @@ -703,7 +703,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/work/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-4.isolated.gen.json" ], "infra_step": true, @@ -717,7 +717,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" ], "infra_step": true, "name": "rmtree slave5" @@ -732,7 +732,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" ], "infra_step": true, "name": "makedirs slave5" @@ -752,7 +752,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/48/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/49/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/50/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" ], "name": "gsutil cp (5)" }, @@ -779,7 +779,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/work/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-5.isolated.gen.json" ], "infra_step": true, @@ -794,10 +794,10 @@ "/path/to/tmp/json", "copy", "{\"chromium_build\": \"2b7e85eb251dc7-a3cf3659ed2c08\", \"num_slaves\": 5, \"page_type\": \"All\"}", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version" ], "infra_step": true, - "name": "Create [CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version" + "name": "Create [START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version" }, { "cmd": [ 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 ec2d97d55d..73971f8f20 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 @@ -9,7 +9,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]" + "[START_DIR]/cache/work" ], "infra_step": true, "name": "makedirs checkout_path" @@ -22,10 +22,10 @@ "--json-output", "/path/to/tmp/json", "remove", - "[CUSTOM_/_B_WORK]/.gclient_entries" + "[START_DIR]/cache/work/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" + "name": "remove [START_DIR]/cache/work/.gclient_entries" }, { "cmd": [ @@ -33,13 +33,13 @@ "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", - "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", + "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", "--revision_mapping_file", "{\"got_revision\": \"skia\"}", "--git-cache-dir", - "[CUSTOM_/_B_CACHE]", + "[START_DIR]/cache/git", "--cleanup-dir", "[CLEANUP]/bot_update", "--output_json", @@ -47,7 +47,7 @@ "--revision", "skia@abc123" ], - "cwd": "[CUSTOM_/_B_WORK]", + "cwd": "[START_DIR]/cache/work", "env_prefixes": { "PATH": [ "RECIPE_PACKAGE_REPO[depot_tools]" @@ -116,7 +116,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/clang_linux/VERSION", + "[START_DIR]/cache/work/skia/infra/bots/assets/clang_linux/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -126,9 +126,9 @@ "cmd": [ "python", "-u", - "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" + "[START_DIR]/cache/work/skia/bin/fetch-gn" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", @@ -140,12 +140,12 @@ }, { "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", + "[START_DIR]/cache/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", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", @@ -162,7 +162,7 @@ "-C", "[START_DIR]/build/out/Debug" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", @@ -177,7 +177,7 @@ "-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', '*.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" + "[START_DIR]/cache/work/skia/infra/bots/ct" ], "infra_step": true, "name": "copy build products", @@ -318,7 +318,7 @@ "--bucket", "chromium-luci", "-d", - "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go/linux64" + "[START_DIR]/cache/work/skia/infra/bots/tools/luci-go/linux64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>" @@ -334,7 +334,7 @@ "--bucket", "chromium-luci", "-d", - "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go/mac64" + "[START_DIR]/cache/work/skia/infra/bots/tools/luci-go/mac64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>" @@ -350,7 +350,7 @@ "--bucket", "chromium-luci", "-d", - "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go/win64" + "[START_DIR]/cache/work/skia/infra/bots/tools/luci-go/win64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>" @@ -378,7 +378,7 @@ "--json-output", "/path/to/tmp/json", "copytree", - "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go", + "[START_DIR]/cache/work/skia/infra/bots/tools/luci-go", "[START_DIR]/luci-go" ], "infra_step": true, @@ -409,7 +409,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" ], "infra_step": true, "name": "rmtree slave1" @@ -424,7 +424,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" ], "infra_step": true, "name": "makedirs slave1" @@ -444,7 +444,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/8/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/9/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/10/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" ], "name": "gsutil cp" }, @@ -471,7 +471,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/work/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-1.isolated.gen.json" ], "infra_step": true, @@ -485,7 +485,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" ], "infra_step": true, "name": "rmtree slave2" @@ -500,7 +500,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" ], "infra_step": true, "name": "makedirs slave2" @@ -520,7 +520,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/18/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/19/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/20/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" ], "name": "gsutil cp (2)" }, @@ -547,7 +547,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/work/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-2.isolated.gen.json" ], "infra_step": true, @@ -561,7 +561,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" ], "infra_step": true, "name": "rmtree slave3" @@ -576,7 +576,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" ], "infra_step": true, "name": "makedirs slave3" @@ -596,7 +596,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/28/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/29/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/30/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" ], "name": "gsutil cp (3)" }, @@ -623,7 +623,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/work/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-3.isolated.gen.json" ], "infra_step": true, @@ -637,7 +637,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" ], "infra_step": true, "name": "rmtree slave4" @@ -652,7 +652,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" ], "infra_step": true, "name": "makedirs slave4" @@ -672,7 +672,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/38/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/39/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/40/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" ], "name": "gsutil cp (4)" }, @@ -699,7 +699,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/work/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-4.isolated.gen.json" ], "infra_step": true, @@ -713,7 +713,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" ], "infra_step": true, "name": "rmtree slave5" @@ -728,7 +728,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" ], "infra_step": true, "name": "makedirs slave5" @@ -748,7 +748,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/48/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/49/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/50/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" ], "name": "gsutil cp (5)" }, @@ -775,7 +775,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/work/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-5.isolated.gen.json" ], "infra_step": true, @@ -790,10 +790,10 @@ "/path/to/tmp/json", "copy", "{\"chromium_build\": \"2b7e85eb251dc7-a3cf3659ed2c08\", \"num_slaves\": 5, \"page_type\": \"All\"}", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version" ], "infra_step": true, - "name": "Create [CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version" + "name": "Create [START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version" }, { "cmd": [ 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 03368f5213..fe21bc7602 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 @@ -9,7 +9,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]" + "[START_DIR]/cache/work" ], "infra_step": true, "name": "makedirs checkout_path" @@ -22,10 +22,10 @@ "--json-output", "/path/to/tmp/json", "remove", - "[CUSTOM_/_B_WORK]/.gclient_entries" + "[START_DIR]/cache/work/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" + "name": "remove [START_DIR]/cache/work/.gclient_entries" }, { "cmd": [ @@ -33,13 +33,13 @@ "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", - "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", + "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", "--revision_mapping_file", "{\"got_revision\": \"skia\"}", "--git-cache-dir", - "[CUSTOM_/_B_CACHE]", + "[START_DIR]/cache/git", "--cleanup-dir", "[CLEANUP]/bot_update", "--output_json", @@ -47,7 +47,7 @@ "--revision", "skia@abc123" ], - "cwd": "[CUSTOM_/_B_WORK]", + "cwd": "[START_DIR]/cache/work", "env_prefixes": { "PATH": [ "RECIPE_PACKAGE_REPO[depot_tools]" @@ -116,7 +116,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/clang_linux/VERSION", + "[START_DIR]/cache/work/skia/infra/bots/assets/clang_linux/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -126,9 +126,9 @@ "cmd": [ "python", "-u", - "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" + "[START_DIR]/cache/work/skia/bin/fetch-gn" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", @@ -140,12 +140,12 @@ }, { "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", + "[START_DIR]/cache/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", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", @@ -162,7 +162,7 @@ "-C", "[START_DIR]/build/out/Debug" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", @@ -177,7 +177,7 @@ "-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', '*.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" + "[START_DIR]/cache/work/skia/infra/bots/ct" ], "infra_step": true, "name": "copy build products", @@ -318,7 +318,7 @@ "--bucket", "chromium-luci", "-d", - "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go/linux64" + "[START_DIR]/cache/work/skia/infra/bots/tools/luci-go/linux64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>" @@ -334,7 +334,7 @@ "--bucket", "chromium-luci", "-d", - "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go/mac64" + "[START_DIR]/cache/work/skia/infra/bots/tools/luci-go/mac64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>" @@ -350,7 +350,7 @@ "--bucket", "chromium-luci", "-d", - "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go/win64" + "[START_DIR]/cache/work/skia/infra/bots/tools/luci-go/win64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>" @@ -378,7 +378,7 @@ "--json-output", "/path/to/tmp/json", "copytree", - "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go", + "[START_DIR]/cache/work/skia/infra/bots/tools/luci-go", "[START_DIR]/luci-go" ], "infra_step": true, @@ -409,7 +409,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" ], "infra_step": true, "name": "rmtree slave1" @@ -424,7 +424,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" ], "infra_step": true, "name": "makedirs slave1" @@ -444,7 +444,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/8/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/9/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/10/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" ], "name": "gsutil cp" }, @@ -471,7 +471,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/work/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-1.isolated.gen.json" ], "infra_step": true, @@ -485,7 +485,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" ], "infra_step": true, "name": "rmtree slave2" @@ -500,7 +500,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" ], "infra_step": true, "name": "makedirs slave2" @@ -520,7 +520,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/18/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/19/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/20/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" ], "name": "gsutil cp (2)" }, @@ -547,7 +547,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/work/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-2.isolated.gen.json" ], "infra_step": true, @@ -561,7 +561,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" ], "infra_step": true, "name": "rmtree slave3" @@ -576,7 +576,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" ], "infra_step": true, "name": "makedirs slave3" @@ -596,7 +596,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/28/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/29/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/30/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" ], "name": "gsutil cp (3)" }, @@ -623,7 +623,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/work/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-3.isolated.gen.json" ], "infra_step": true, @@ -637,7 +637,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" ], "infra_step": true, "name": "rmtree slave4" @@ -652,7 +652,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" ], "infra_step": true, "name": "makedirs slave4" @@ -672,7 +672,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/38/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/39/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/40/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" ], "name": "gsutil cp (4)" }, @@ -699,7 +699,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/work/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-4.isolated.gen.json" ], "infra_step": true, @@ -713,7 +713,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" ], "infra_step": true, "name": "rmtree slave5" @@ -728,7 +728,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" ], "infra_step": true, "name": "makedirs slave5" @@ -748,7 +748,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/48/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/49/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/50/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" ], "name": "gsutil cp (5)" }, @@ -775,7 +775,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/work/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-5.isolated.gen.json" ], "infra_step": true, @@ -790,10 +790,10 @@ "/path/to/tmp/json", "copy", "{\"chromium_build\": \"2b7e85eb251dc7-a3cf3659ed2c08\", \"num_slaves\": 5, \"page_type\": \"All\"}", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version" ], "infra_step": true, - "name": "Create [CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version" + "name": "Create [START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version" }, { "cmd": [ 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 6104882393..ab5d017882 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 @@ -9,7 +9,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]" + "[START_DIR]/cache/work" ], "infra_step": true, "name": "makedirs checkout_path" @@ -22,10 +22,10 @@ "--json-output", "/path/to/tmp/json", "remove", - "[CUSTOM_/_B_WORK]/.gclient_entries" + "[START_DIR]/cache/work/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" + "name": "remove [START_DIR]/cache/work/.gclient_entries" }, { "cmd": [ @@ -33,13 +33,13 @@ "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", - "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", + "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", "--revision_mapping_file", "{\"got_revision\": \"skia\"}", "--git-cache-dir", - "[CUSTOM_/_B_CACHE]", + "[START_DIR]/cache/git", "--cleanup-dir", "[CLEANUP]/bot_update", "--output_json", @@ -47,7 +47,7 @@ "--revision", "skia@abc123" ], - "cwd": "[CUSTOM_/_B_WORK]", + "cwd": "[START_DIR]/cache/work", "env_prefixes": { "PATH": [ "RECIPE_PACKAGE_REPO[depot_tools]" @@ -116,7 +116,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/clang_linux/VERSION", + "[START_DIR]/cache/work/skia/infra/bots/assets/clang_linux/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -126,9 +126,9 @@ "cmd": [ "python", "-u", - "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" + "[START_DIR]/cache/work/skia/bin/fetch-gn" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", @@ -140,12 +140,12 @@ }, { "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", + "[START_DIR]/cache/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", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", @@ -162,7 +162,7 @@ "-C", "[START_DIR]/build/out/Debug" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", @@ -177,7 +177,7 @@ "-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', '*.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" + "[START_DIR]/cache/work/skia/infra/bots/ct" ], "infra_step": true, "name": "copy build products", @@ -318,7 +318,7 @@ "--bucket", "chromium-luci", "-d", - "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go/linux64" + "[START_DIR]/cache/work/skia/infra/bots/tools/luci-go/linux64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>" @@ -334,7 +334,7 @@ "--bucket", "chromium-luci", "-d", - "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go/mac64" + "[START_DIR]/cache/work/skia/infra/bots/tools/luci-go/mac64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>" @@ -350,7 +350,7 @@ "--bucket", "chromium-luci", "-d", - "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go/win64" + "[START_DIR]/cache/work/skia/infra/bots/tools/luci-go/win64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>" @@ -378,7 +378,7 @@ "--json-output", "/path/to/tmp/json", "copytree", - "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go", + "[START_DIR]/cache/work/skia/infra/bots/tools/luci-go", "[START_DIR]/luci-go" ], "infra_step": true, @@ -409,7 +409,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" ], "infra_step": true, "name": "rmtree slave1" @@ -424,7 +424,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" ], "infra_step": true, "name": "makedirs slave1" @@ -444,7 +444,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/8/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/9/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/10/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" ], "name": "gsutil cp" }, @@ -471,7 +471,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/work/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-1.isolated.gen.json" ], "infra_step": true, @@ -485,7 +485,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" ], "infra_step": true, "name": "rmtree slave2" @@ -500,7 +500,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" ], "infra_step": true, "name": "makedirs slave2" @@ -520,7 +520,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/18/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/19/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/20/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" ], "name": "gsutil cp (2)" }, @@ -547,7 +547,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/work/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-2.isolated.gen.json" ], "infra_step": true, @@ -561,7 +561,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" ], "infra_step": true, "name": "rmtree slave3" @@ -576,7 +576,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" ], "infra_step": true, "name": "makedirs slave3" @@ -596,7 +596,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/28/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/29/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/30/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" ], "name": "gsutil cp (3)" }, @@ -623,7 +623,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/work/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-3.isolated.gen.json" ], "infra_step": true, @@ -637,7 +637,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" ], "infra_step": true, "name": "rmtree slave4" @@ -652,7 +652,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" ], "infra_step": true, "name": "makedirs slave4" @@ -672,7 +672,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/38/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/39/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/40/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" ], "name": "gsutil cp (4)" }, @@ -699,7 +699,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/work/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-4.isolated.gen.json" ], "infra_step": true, @@ -713,7 +713,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" ], "infra_step": true, "name": "rmtree slave5" @@ -728,7 +728,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" ], "infra_step": true, "name": "makedirs slave5" @@ -748,7 +748,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/48/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/49/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/50/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" ], "name": "gsutil cp (5)" }, @@ -775,7 +775,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/work/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-5.isolated.gen.json" ], "infra_step": true, @@ -790,10 +790,10 @@ "/path/to/tmp/json", "copy", "{\"chromium_build\": \"2b7e85eb251dc7-a3cf3659ed2c08\", \"num_slaves\": 5, \"page_type\": \"All\"}", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version" ], "infra_step": true, - "name": "Create [CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version" + "name": "Create [START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version" }, { "cmd": [ 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 651ff14872..326c4c8a87 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 @@ -9,7 +9,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]" + "[START_DIR]/cache/work" ], "infra_step": true, "name": "makedirs checkout_path" @@ -22,10 +22,10 @@ "--json-output", "/path/to/tmp/json", "remove", - "[CUSTOM_/_B_WORK]/.gclient_entries" + "[START_DIR]/cache/work/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" + "name": "remove [START_DIR]/cache/work/.gclient_entries" }, { "cmd": [ @@ -33,13 +33,13 @@ "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", - "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", + "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", "--revision_mapping_file", "{\"got_revision\": \"skia\"}", "--git-cache-dir", - "[CUSTOM_/_B_CACHE]", + "[START_DIR]/cache/git", "--cleanup-dir", "[CLEANUP]/bot_update", "--output_json", @@ -47,7 +47,7 @@ "--revision", "skia@abc123" ], - "cwd": "[CUSTOM_/_B_WORK]", + "cwd": "[START_DIR]/cache/work", "env_prefixes": { "PATH": [ "RECIPE_PACKAGE_REPO[depot_tools]" @@ -116,7 +116,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/clang_linux/VERSION", + "[START_DIR]/cache/work/skia/infra/bots/assets/clang_linux/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -126,9 +126,9 @@ "cmd": [ "python", "-u", - "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" + "[START_DIR]/cache/work/skia/bin/fetch-gn" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", @@ -140,12 +140,12 @@ }, { "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", + "[START_DIR]/cache/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", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", @@ -162,7 +162,7 @@ "-C", "[START_DIR]/build/out/Release" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", @@ -177,7 +177,7 @@ "-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', '*.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" + "[START_DIR]/cache/work/skia/infra/bots/ct" ], "infra_step": true, "name": "copy build products", @@ -318,7 +318,7 @@ "--bucket", "chromium-luci", "-d", - "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go/linux64" + "[START_DIR]/cache/work/skia/infra/bots/tools/luci-go/linux64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>" @@ -334,7 +334,7 @@ "--bucket", "chromium-luci", "-d", - "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go/mac64" + "[START_DIR]/cache/work/skia/infra/bots/tools/luci-go/mac64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>" @@ -350,7 +350,7 @@ "--bucket", "chromium-luci", "-d", - "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go/win64" + "[START_DIR]/cache/work/skia/infra/bots/tools/luci-go/win64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>" @@ -378,7 +378,7 @@ "--json-output", "/path/to/tmp/json", "copytree", - "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go", + "[START_DIR]/cache/work/skia/infra/bots/tools/luci-go", "[START_DIR]/luci-go" ], "infra_step": true, @@ -409,7 +409,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" ], "infra_step": true, "name": "rmtree slave1" @@ -424,7 +424,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" ], "infra_step": true, "name": "makedirs slave1" @@ -444,7 +444,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/8/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/9/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/10/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" ], "name": "gsutil cp" }, @@ -471,7 +471,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/work/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-nanobench-1.isolated.gen.json" ], "infra_step": true, @@ -485,7 +485,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" ], "infra_step": true, "name": "rmtree slave2" @@ -500,7 +500,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" ], "infra_step": true, "name": "makedirs slave2" @@ -520,7 +520,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/18/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/19/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/20/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" ], "name": "gsutil cp (2)" }, @@ -547,7 +547,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/work/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-nanobench-2.isolated.gen.json" ], "infra_step": true, @@ -561,7 +561,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" ], "infra_step": true, "name": "rmtree slave3" @@ -576,7 +576,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" ], "infra_step": true, "name": "makedirs slave3" @@ -596,7 +596,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/28/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/29/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/30/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" ], "name": "gsutil cp (3)" }, @@ -623,7 +623,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/work/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-nanobench-3.isolated.gen.json" ], "infra_step": true, @@ -637,7 +637,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" ], "infra_step": true, "name": "rmtree slave4" @@ -652,7 +652,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" ], "infra_step": true, "name": "makedirs slave4" @@ -672,7 +672,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/38/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/39/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/40/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" ], "name": "gsutil cp (4)" }, @@ -699,7 +699,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/work/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-nanobench-4.isolated.gen.json" ], "infra_step": true, @@ -713,7 +713,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" ], "infra_step": true, "name": "rmtree slave5" @@ -728,7 +728,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" ], "infra_step": true, "name": "makedirs slave5" @@ -748,7 +748,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/48/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/49/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/50/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" ], "name": "gsutil cp (5)" }, @@ -775,7 +775,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/work/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-nanobench-5.isolated.gen.json" ], "infra_step": true, @@ -790,10 +790,10 @@ "/path/to/tmp/json", "copy", "{\"chromium_build\": \"2b7e85eb251dc7-a3cf3659ed2c08\", \"num_slaves\": 5, \"page_type\": \"All\"}", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version" ], "infra_step": true, - "name": "Create [CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version" + "name": "Create [START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version" }, { "cmd": [ 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 34d114203a..4873519fcd 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 @@ -9,7 +9,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]" + "[START_DIR]/cache/work" ], "infra_step": true, "name": "makedirs checkout_path" @@ -22,10 +22,10 @@ "--json-output", "/path/to/tmp/json", "remove", - "[CUSTOM_/_B_WORK]/.gclient_entries" + "[START_DIR]/cache/work/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" + "name": "remove [START_DIR]/cache/work/.gclient_entries" }, { "cmd": [ @@ -33,13 +33,13 @@ "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", - "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", + "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", "--revision_mapping_file", "{\"got_revision\": \"skia\"}", "--git-cache-dir", - "[CUSTOM_/_B_CACHE]", + "[START_DIR]/cache/git", "--cleanup-dir", "[CLEANUP]/bot_update", "--output_json", @@ -47,7 +47,7 @@ "--revision", "skia@abc123" ], - "cwd": "[CUSTOM_/_B_WORK]", + "cwd": "[START_DIR]/cache/work", "env_prefixes": { "PATH": [ "RECIPE_PACKAGE_REPO[depot_tools]" @@ -116,7 +116,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/clang_linux/VERSION", + "[START_DIR]/cache/work/skia/infra/bots/assets/clang_linux/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -126,9 +126,9 @@ "cmd": [ "python", "-u", - "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" + "[START_DIR]/cache/work/skia/bin/fetch-gn" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", @@ -140,12 +140,12 @@ }, { "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", + "[START_DIR]/cache/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", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", @@ -162,7 +162,7 @@ "-C", "[START_DIR]/build/out/Release" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", @@ -177,7 +177,7 @@ "-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', '*.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" + "[START_DIR]/cache/work/skia/infra/bots/ct" ], "infra_step": true, "name": "copy build products", @@ -318,7 +318,7 @@ "--bucket", "chromium-luci", "-d", - "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go/linux64" + "[START_DIR]/cache/work/skia/infra/bots/tools/luci-go/linux64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>" @@ -334,7 +334,7 @@ "--bucket", "chromium-luci", "-d", - "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go/mac64" + "[START_DIR]/cache/work/skia/infra/bots/tools/luci-go/mac64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>" @@ -350,7 +350,7 @@ "--bucket", "chromium-luci", "-d", - "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go/win64" + "[START_DIR]/cache/work/skia/infra/bots/tools/luci-go/win64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>" @@ -378,7 +378,7 @@ "--json-output", "/path/to/tmp/json", "copytree", - "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go", + "[START_DIR]/cache/work/skia/infra/bots/tools/luci-go", "[START_DIR]/luci-go" ], "infra_step": true, @@ -409,7 +409,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" ], "infra_step": true, "name": "rmtree slave1" @@ -424,7 +424,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" ], "infra_step": true, "name": "makedirs slave1" @@ -444,7 +444,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/8/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/9/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/10/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" ], "name": "gsutil cp" }, @@ -471,7 +471,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/work/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-nanobench-1.isolated.gen.json" ], "infra_step": true, @@ -485,7 +485,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" ], "infra_step": true, "name": "rmtree slave2" @@ -500,7 +500,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" ], "infra_step": true, "name": "makedirs slave2" @@ -520,7 +520,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/18/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/19/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/20/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" ], "name": "gsutil cp (2)" }, @@ -547,7 +547,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/work/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-nanobench-2.isolated.gen.json" ], "infra_step": true, @@ -561,7 +561,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" ], "infra_step": true, "name": "rmtree slave3" @@ -576,7 +576,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" ], "infra_step": true, "name": "makedirs slave3" @@ -596,7 +596,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/28/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/29/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/30/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" ], "name": "gsutil cp (3)" }, @@ -623,7 +623,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/work/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-nanobench-3.isolated.gen.json" ], "infra_step": true, @@ -637,7 +637,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" ], "infra_step": true, "name": "rmtree slave4" @@ -652,7 +652,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" ], "infra_step": true, "name": "makedirs slave4" @@ -672,7 +672,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/38/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/39/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/40/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" ], "name": "gsutil cp (4)" }, @@ -699,7 +699,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/work/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-nanobench-4.isolated.gen.json" ], "infra_step": true, @@ -713,7 +713,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" ], "infra_step": true, "name": "rmtree slave5" @@ -728,7 +728,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" ], "infra_step": true, "name": "makedirs slave5" @@ -748,7 +748,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/48/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/49/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/50/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" ], "name": "gsutil cp (5)" }, @@ -775,7 +775,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/work/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-nanobench-5.isolated.gen.json" ], "infra_step": true, @@ -790,10 +790,10 @@ "/path/to/tmp/json", "copy", "{\"chromium_build\": \"2b7e85eb251dc7-a3cf3659ed2c08\", \"num_slaves\": 5, \"page_type\": \"All\"}", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version" ], "infra_step": true, - "name": "Create [CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version" + "name": "Create [START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version" }, { "cmd": [ 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 a1c287dc39..c05cbef8d3 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 @@ -9,7 +9,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]" + "[START_DIR]/cache/work" ], "infra_step": true, "name": "makedirs checkout_path" @@ -22,10 +22,10 @@ "--json-output", "/path/to/tmp/json", "remove", - "[CUSTOM_/_B_WORK]/.gclient_entries" + "[START_DIR]/cache/work/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" + "name": "remove [START_DIR]/cache/work/.gclient_entries" }, { "cmd": [ @@ -33,13 +33,13 @@ "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", - "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", + "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", "--revision_mapping_file", "{\"got_revision\": \"skia\"}", "--git-cache-dir", - "[CUSTOM_/_B_CACHE]", + "[START_DIR]/cache/git", "--cleanup-dir", "[CLEANUP]/bot_update", "--output_json", @@ -47,7 +47,7 @@ "--revision", "skia@abc123" ], - "cwd": "[CUSTOM_/_B_WORK]", + "cwd": "[START_DIR]/cache/work", "env_prefixes": { "PATH": [ "RECIPE_PACKAGE_REPO[depot_tools]" @@ -116,7 +116,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/clang_linux/VERSION", + "[START_DIR]/cache/work/skia/infra/bots/assets/clang_linux/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -126,9 +126,9 @@ "cmd": [ "python", "-u", - "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" + "[START_DIR]/cache/work/skia/bin/fetch-gn" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", @@ -140,12 +140,12 @@ }, { "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", + "[START_DIR]/cache/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", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", @@ -162,7 +162,7 @@ "-C", "[START_DIR]/build/out/Debug" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", @@ -177,7 +177,7 @@ "-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', '*.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" + "[START_DIR]/cache/work/skia/infra/bots/ct" ], "infra_step": true, "name": "copy build products", @@ -318,7 +318,7 @@ "--bucket", "chromium-luci", "-d", - "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go/linux64" + "[START_DIR]/cache/work/skia/infra/bots/tools/luci-go/linux64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>" @@ -334,7 +334,7 @@ "--bucket", "chromium-luci", "-d", - "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go/mac64" + "[START_DIR]/cache/work/skia/infra/bots/tools/luci-go/mac64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>" @@ -350,7 +350,7 @@ "--bucket", "chromium-luci", "-d", - "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go/win64" + "[START_DIR]/cache/work/skia/infra/bots/tools/luci-go/win64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>" @@ -378,7 +378,7 @@ "--json-output", "/path/to/tmp/json", "copytree", - "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go", + "[START_DIR]/cache/work/skia/infra/bots/tools/luci-go", "[START_DIR]/luci-go" ], "infra_step": true, @@ -409,7 +409,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" ], "infra_step": true, "name": "rmtree slave1" @@ -424,7 +424,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" ], "infra_step": true, "name": "makedirs slave1" @@ -444,7 +444,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/8/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/9/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/10/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" ], "name": "gsutil cp" }, @@ -471,7 +471,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/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, @@ -485,7 +485,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" ], "infra_step": true, "name": "rmtree slave2" @@ -500,7 +500,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" ], "infra_step": true, "name": "makedirs slave2" @@ -520,7 +520,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/18/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/19/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/20/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" ], "name": "gsutil cp (2)" }, @@ -547,7 +547,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/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, @@ -561,7 +561,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" ], "infra_step": true, "name": "rmtree slave3" @@ -576,7 +576,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" ], "infra_step": true, "name": "makedirs slave3" @@ -596,7 +596,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/28/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/29/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/30/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" ], "name": "gsutil cp (3)" }, @@ -623,7 +623,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/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, @@ -637,7 +637,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" ], "infra_step": true, "name": "rmtree slave4" @@ -652,7 +652,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" ], "infra_step": true, "name": "makedirs slave4" @@ -672,7 +672,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/38/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/39/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/40/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" ], "name": "gsutil cp (4)" }, @@ -699,7 +699,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/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, @@ -713,7 +713,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" ], "infra_step": true, "name": "rmtree slave5" @@ -728,7 +728,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" ], "infra_step": true, "name": "makedirs slave5" @@ -748,7 +748,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/48/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/49/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/50/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" ], "name": "gsutil cp (5)" }, @@ -775,7 +775,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/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, @@ -790,10 +790,10 @@ "/path/to/tmp/json", "copy", "{\"chromium_build\": \"2b7e85eb251dc7-a3cf3659ed2c08\", \"num_slaves\": 5, \"page_type\": \"All\"}", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version" ], "infra_step": true, - "name": "Create [CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version" + "name": "Create [START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version" }, { "cmd": [ 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 288767f981..cca63c9860 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 @@ -9,7 +9,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]" + "[START_DIR]/cache/work" ], "infra_step": true, "name": "makedirs checkout_path" @@ -22,10 +22,10 @@ "--json-output", "/path/to/tmp/json", "remove", - "[CUSTOM_/_B_WORK]/.gclient_entries" + "[START_DIR]/cache/work/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" + "name": "remove [START_DIR]/cache/work/.gclient_entries" }, { "cmd": [ @@ -33,13 +33,13 @@ "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", - "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", + "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", "--revision_mapping_file", "{\"got_revision\": \"skia\"}", "--git-cache-dir", - "[CUSTOM_/_B_CACHE]", + "[START_DIR]/cache/git", "--cleanup-dir", "[CLEANUP]/bot_update", "--output_json", @@ -47,7 +47,7 @@ "--revision", "skia@abc123" ], - "cwd": "[CUSTOM_/_B_WORK]", + "cwd": "[START_DIR]/cache/work", "env_prefixes": { "PATH": [ "RECIPE_PACKAGE_REPO[depot_tools]" @@ -116,7 +116,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/clang_linux/VERSION", + "[START_DIR]/cache/work/skia/infra/bots/assets/clang_linux/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -126,9 +126,9 @@ "cmd": [ "python", "-u", - "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" + "[START_DIR]/cache/work/skia/bin/fetch-gn" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", @@ -140,12 +140,12 @@ }, { "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", + "[START_DIR]/cache/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", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", @@ -162,7 +162,7 @@ "-C", "[START_DIR]/build/out/Debug" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", @@ -177,7 +177,7 @@ "-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', '*.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" + "[START_DIR]/cache/work/skia/infra/bots/ct" ], "infra_step": true, "name": "copy build products", @@ -318,7 +318,7 @@ "--bucket", "chromium-luci", "-d", - "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go/linux64" + "[START_DIR]/cache/work/skia/infra/bots/tools/luci-go/linux64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>" @@ -334,7 +334,7 @@ "--bucket", "chromium-luci", "-d", - "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go/mac64" + "[START_DIR]/cache/work/skia/infra/bots/tools/luci-go/mac64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>" @@ -350,7 +350,7 @@ "--bucket", "chromium-luci", "-d", - "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go/win64" + "[START_DIR]/cache/work/skia/infra/bots/tools/luci-go/win64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>" @@ -378,7 +378,7 @@ "--json-output", "/path/to/tmp/json", "copytree", - "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go", + "[START_DIR]/cache/work/skia/infra/bots/tools/luci-go", "[START_DIR]/luci-go" ], "infra_step": true, @@ -409,7 +409,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" ], "infra_step": true, "name": "rmtree slave1" @@ -424,7 +424,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" ], "infra_step": true, "name": "makedirs slave1" @@ -444,7 +444,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/8/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/9/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/10/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" ], "name": "gsutil cp" }, @@ -471,7 +471,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/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, @@ -485,7 +485,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" ], "infra_step": true, "name": "rmtree slave2" @@ -500,7 +500,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" ], "infra_step": true, "name": "makedirs slave2" @@ -520,7 +520,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/18/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/19/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/20/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" ], "name": "gsutil cp (2)" }, @@ -547,7 +547,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/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, @@ -561,7 +561,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" ], "infra_step": true, "name": "rmtree slave3" @@ -576,7 +576,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" ], "infra_step": true, "name": "makedirs slave3" @@ -596,7 +596,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/28/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/29/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/30/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" ], "name": "gsutil cp (3)" }, @@ -623,7 +623,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/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, @@ -637,7 +637,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" ], "infra_step": true, "name": "rmtree slave4" @@ -652,7 +652,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" ], "infra_step": true, "name": "makedirs slave4" @@ -672,7 +672,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/38/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/39/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/40/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" ], "name": "gsutil cp (4)" }, @@ -699,7 +699,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/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, @@ -713,7 +713,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" ], "infra_step": true, "name": "rmtree slave5" @@ -728,7 +728,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" ], "infra_step": true, "name": "makedirs slave5" @@ -748,7 +748,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/48/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/49/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/50/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" ], "name": "gsutil cp (5)" }, @@ -775,7 +775,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/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, @@ -790,10 +790,10 @@ "/path/to/tmp/json", "copy", "{\"chromium_build\": \"2b7e85eb251dc7-a3cf3659ed2c08\", \"num_slaves\": 5, \"page_type\": \"All\"}", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version" ], "infra_step": true, - "name": "Create [CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version" + "name": "Create [START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version" }, { "cmd": [ 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 d2031fdc30..ba92295670 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 @@ -9,7 +9,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]" + "[START_DIR]/cache/work" ], "infra_step": true, "name": "makedirs checkout_path" @@ -22,10 +22,10 @@ "--json-output", "/path/to/tmp/json", "remove", - "[CUSTOM_/_B_WORK]/.gclient_entries" + "[START_DIR]/cache/work/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" + "name": "remove [START_DIR]/cache/work/.gclient_entries" }, { "cmd": [ @@ -33,13 +33,13 @@ "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", - "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", + "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", "--revision_mapping_file", "{\"got_revision\": \"skia\"}", "--git-cache-dir", - "[CUSTOM_/_B_CACHE]", + "[START_DIR]/cache/git", "--cleanup-dir", "[CLEANUP]/bot_update", "--gerrit_repo", @@ -51,7 +51,7 @@ "--revision", "skia@abc123" ], - "cwd": "[CUSTOM_/_B_WORK]", + "cwd": "[START_DIR]/cache/work", "env_prefixes": { "PATH": [ "RECIPE_PACKAGE_REPO[depot_tools]" @@ -120,7 +120,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/clang_linux/VERSION", + "[START_DIR]/cache/work/skia/infra/bots/assets/clang_linux/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -130,9 +130,9 @@ "cmd": [ "python", "-u", - "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" + "[START_DIR]/cache/work/skia/bin/fetch-gn" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", @@ -144,12 +144,12 @@ }, { "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", + "[START_DIR]/cache/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", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", @@ -166,7 +166,7 @@ "-C", "[START_DIR]/build/out/Debug" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", @@ -181,7 +181,7 @@ "-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', '*.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" + "[START_DIR]/cache/work/skia/infra/bots/ct" ], "infra_step": true, "name": "copy build products", @@ -322,7 +322,7 @@ "--bucket", "chromium-luci", "-d", - "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go/linux64" + "[START_DIR]/cache/work/skia/infra/bots/tools/luci-go/linux64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>" @@ -338,7 +338,7 @@ "--bucket", "chromium-luci", "-d", - "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go/mac64" + "[START_DIR]/cache/work/skia/infra/bots/tools/luci-go/mac64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>" @@ -354,7 +354,7 @@ "--bucket", "chromium-luci", "-d", - "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go/win64" + "[START_DIR]/cache/work/skia/infra/bots/tools/luci-go/win64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>" @@ -382,7 +382,7 @@ "--json-output", "/path/to/tmp/json", "copytree", - "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go", + "[START_DIR]/cache/work/skia/infra/bots/tools/luci-go", "[START_DIR]/luci-go" ], "infra_step": true, @@ -413,7 +413,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" ], "infra_step": true, "name": "rmtree slave1" @@ -428,7 +428,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" ], "infra_step": true, "name": "makedirs slave1" @@ -448,7 +448,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/8/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/9/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/10/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1" ], "name": "gsutil cp" }, @@ -475,7 +475,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/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, @@ -489,7 +489,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" ], "infra_step": true, "name": "rmtree slave2" @@ -504,7 +504,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" ], "infra_step": true, "name": "makedirs slave2" @@ -524,7 +524,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/18/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/19/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/20/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2" ], "name": "gsutil cp (2)" }, @@ -551,7 +551,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/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, @@ -565,7 +565,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" ], "infra_step": true, "name": "rmtree slave3" @@ -580,7 +580,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" ], "infra_step": true, "name": "makedirs slave3" @@ -600,7 +600,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/28/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/29/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/30/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3" ], "name": "gsutil cp (3)" }, @@ -627,7 +627,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/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, @@ -641,7 +641,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" ], "infra_step": true, "name": "rmtree slave4" @@ -656,7 +656,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" ], "infra_step": true, "name": "makedirs slave4" @@ -676,7 +676,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/38/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/39/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/40/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4" ], "name": "gsutil cp (4)" }, @@ -703,7 +703,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/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, @@ -717,7 +717,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" ], "infra_step": true, "name": "rmtree slave5" @@ -732,7 +732,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" ], "infra_step": true, "name": "makedirs slave5" @@ -752,7 +752,7 @@ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/48/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/49/*.skp", "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/50/*.skp", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5" ], "name": "gsutil cp (5)" }, @@ -779,7 +779,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 \"[START_DIR]/cache/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\": \"[START_DIR]/cache/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, @@ -794,10 +794,10 @@ "/path/to/tmp/json", "copy", "{\"chromium_build\": \"2b7e85eb251dc7-a3cf3659ed2c08\", \"num_slaves\": 5, \"page_type\": \"All\"}", - "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version" + "[START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version" ], "infra_step": true, - "name": "Create [CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version" + "name": "Create [START_DIR]/cache/work/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version" }, { "cmd": [ |