diff options
Diffstat (limited to 'infra/bots/recipes')
54 files changed, 830 insertions, 820 deletions
diff --git a/infra/bots/recipes/bookmaker.expected/nightly_bookmaker.json b/infra/bots/recipes/bookmaker.expected/nightly_bookmaker.json index 863a924f3f..eead16ebe1 100644 --- a/infra/bots/recipes/bookmaker.expected/nightly_bookmaker.json +++ b/infra/bots/recipes/bookmaker.expected/nightly_bookmaker.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]" @@ -149,7 +149,7 @@ "-e", "[START_DIR]/fiddle.json" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", @@ -170,7 +170,7 @@ "--logtostderr", "--force" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", @@ -192,7 +192,7 @@ "[START_DIR]/fiddleout.json", "/path/to/tmp/" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", @@ -206,7 +206,7 @@ "cat", "[START_DIR]/fiddleout.json" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", @@ -220,13 +220,13 @@ { "cmd": [ "python", - "[CUSTOM_/_B_WORK]/skia/infra/bots/upload_md.py", + "[START_DIR]/cache/work/skia/infra/bots/upload_md.py", "--bookmaker_binary", "[START_DIR]/build/out/Release/bookmaker", "--fiddlecli_output", "[START_DIR]/fiddleout.json" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", diff --git a/infra/bots/recipes/bookmaker.expected/nightly_failed_extract_fiddles.json b/infra/bots/recipes/bookmaker.expected/nightly_failed_extract_fiddles.json index e5f591f9bd..9ffbb61ade 100644 --- a/infra/bots/recipes/bookmaker.expected/nightly_failed_extract_fiddles.json +++ b/infra/bots/recipes/bookmaker.expected/nightly_failed_extract_fiddles.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]" @@ -149,7 +149,7 @@ "-e", "[START_DIR]/fiddle.json" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", diff --git a/infra/bots/recipes/bookmaker.expected/nightly_failed_fiddlecli.json b/infra/bots/recipes/bookmaker.expected/nightly_failed_fiddlecli.json index db15d5b9f5..2774b50b61 100644 --- a/infra/bots/recipes/bookmaker.expected/nightly_failed_fiddlecli.json +++ b/infra/bots/recipes/bookmaker.expected/nightly_failed_fiddlecli.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]" @@ -149,7 +149,7 @@ "-e", "[START_DIR]/fiddle.json" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", @@ -170,7 +170,7 @@ "--logtostderr", "--force" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", diff --git a/infra/bots/recipes/bookmaker.expected/nightly_failed_fiddles.json b/infra/bots/recipes/bookmaker.expected/nightly_failed_fiddles.json index f2ea70cb9f..9fab0f5ddc 100644 --- a/infra/bots/recipes/bookmaker.expected/nightly_failed_fiddles.json +++ b/infra/bots/recipes/bookmaker.expected/nightly_failed_fiddles.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]" @@ -149,7 +149,7 @@ "-e", "[START_DIR]/fiddle.json" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", @@ -170,7 +170,7 @@ "--logtostderr", "--force" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", @@ -192,7 +192,7 @@ "[START_DIR]/fiddleout.json", "/path/to/tmp/" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", @@ -206,7 +206,7 @@ "cat", "[START_DIR]/fiddleout.json" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", diff --git a/infra/bots/recipes/bookmaker.expected/nightly_failed_upload.json b/infra/bots/recipes/bookmaker.expected/nightly_failed_upload.json index 3d2966381a..60ccebe788 100644 --- a/infra/bots/recipes/bookmaker.expected/nightly_failed_upload.json +++ b/infra/bots/recipes/bookmaker.expected/nightly_failed_upload.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]" @@ -149,7 +149,7 @@ "-e", "[START_DIR]/fiddle.json" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", @@ -170,7 +170,7 @@ "--logtostderr", "--force" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", @@ -184,13 +184,13 @@ { "cmd": [ "python", - "[CUSTOM_/_B_WORK]/skia/infra/bots/upload_md.py", + "[START_DIR]/cache/work/skia/infra/bots/upload_md.py", "--bookmaker_binary", "[START_DIR]/build/out/Release/bookmaker", "--fiddlecli_output", "[START_DIR]/fiddleout.json" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", diff --git a/infra/bots/recipes/bookmaker.expected/percommit_bookmaker.json b/infra/bots/recipes/bookmaker.expected/percommit_bookmaker.json index 4294790c4c..3a0e4aa58e 100644 --- a/infra/bots/recipes/bookmaker.expected/percommit_bookmaker.json +++ b/infra/bots/recipes/bookmaker.expected/percommit_bookmaker.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]" @@ -148,7 +148,7 @@ "docs/status.json", "-x" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", diff --git a/infra/bots/recipes/bookmaker.expected/percommit_failed_validation.json b/infra/bots/recipes/bookmaker.expected/percommit_failed_validation.json index b91cf84486..f15a9ef22b 100644 --- a/infra/bots/recipes/bookmaker.expected/percommit_failed_validation.json +++ b/infra/bots/recipes/bookmaker.expected/percommit_failed_validation.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]" @@ -148,7 +148,7 @@ "docs/status.json", "-x" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", diff --git a/infra/bots/recipes/check_generated_files.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json b/infra/bots/recipes/check_generated_files.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json index 7c9fe21dab..af5f08e271 100644 --- a/infra/bots/recipes/check_generated_files.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json +++ b/infra/bots/recipes/check_generated_files.expected/Housekeeper-PerCommit-CheckGeneratedFiles.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]" @@ -114,7 +114,7 @@ "diff", "--no-ext-diff" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", @@ -128,9 +128,9 @@ "cmd": [ "python", "-u", - "import os\nimport subprocess\n\nfor r, d, files in os.walk('[CUSTOM_/_B_WORK]/skia'):\n for f in files:\n if f.endswith('.fp'):\n path = os.path.join(r, f)\n print 'touch %s' % path\n subprocess.check_call(['touch', path])\n" + "import os\nimport subprocess\n\nfor r, d, files in os.walk('[START_DIR]/cache/work/skia'):\n for f in files:\n if f.endswith('.fp'):\n path = os.path.join(r, f)\n print 'touch %s' % path\n subprocess.check_call(['touch', path])\n" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", @@ -142,7 +142,7 @@ "@@@STEP_LOG_LINE@python.inline@import os@@@", "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@for r, d, files in os.walk('[CUSTOM_/_B_WORK]/skia'):@@@", + "@@@STEP_LOG_LINE@python.inline@for r, d, files in os.walk('[START_DIR]/cache/work/skia'):@@@", "@@@STEP_LOG_LINE@python.inline@ for f in files:@@@", "@@@STEP_LOG_LINE@python.inline@ if f.endswith('.fp'):@@@", "@@@STEP_LOG_LINE@python.inline@ path = os.path.join(r, f)@@@", @@ -155,9 +155,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", @@ -171,9 +171,9 @@ "cmd": [ "python", "-u", - "[CUSTOM_/_B_WORK]/skia/bin/fetch-clang-format" + "[START_DIR]/cache/work/skia/bin/fetch-clang-format" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", @@ -185,16 +185,16 @@ }, { "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", + "[START_DIR]/cache/work/skia/bin/gn", "gen", "[START_DIR]/build/out/Release", "--args=is_debug=false skia_compile_processors=true skia_generate_workarounds=true" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": "[CUSTOM_/_B_WORK]/skia/bin:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "[START_DIR]/cache/work/skia/bin:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/build/out" }, "name": "gn gen" @@ -207,11 +207,11 @@ "-C", "[START_DIR]/build/out/Release" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": "[CUSTOM_/_B_WORK]/skia/bin:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "[START_DIR]/cache/work/skia/bin:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/build/out" }, "name": "ninja" @@ -222,7 +222,7 @@ "diff", "--no-ext-diff" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", @@ -238,7 +238,7 @@ "-u", "\ndiff1 = ''''''\n\ndiff2 = ''''''\n\nif diff1 != diff2:\n print 'Generated files have been edited!'\n exit(1)\n" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm-Release-Chromebook_GLES.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm-Release-Chromebook_GLES.json index 9c1347a57a..5420fdbdc5 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm-Release-Chromebook_GLES.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm-Release-Chromebook_GLES.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]" @@ -101,7 +101,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, @@ -111,33 +111,33 @@ "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", "LD_LIBRARY_PATH": "[START_DIR]/armhf_sysroot/lib", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm-Release-Chromebook_GLES" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm-Release-Chromebook_GLES" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", + "[START_DIR]/cache/work/skia/bin/gn", "gen", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm-Release-Chromebook_GLES/Release", + "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm-Release-Chromebook_GLES/Release", "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_asmflags=[\"--target=armv7a-linux-gnueabihf\", \"--sysroot=[START_DIR]/armhf_sysroot\", \"-march=armv7-a\", \"-mfpu=neon\", \"-mthumb\"] extra_cflags=[\"--target=armv7a-linux-gnueabihf\", \"--sysroot=[START_DIR]/armhf_sysroot\", \"-I[START_DIR]/chromebook_arm_gles/include\", \"-I[START_DIR]/armhf_sysroot/include\", \"-I[START_DIR]/armhf_sysroot/include/c++/4.8.4\", \"-I[START_DIR]/armhf_sysroot/include/c++/4.8.4/arm-linux-gnueabihf\", \"-DMESA_EGL_NO_X11_HEADERS\", \"-DDUMMY_clang_linux_version=42\"] extra_ldflags=[\"--target=armv7a-linux-gnueabihf\", \"--sysroot=[START_DIR]/armhf_sysroot\", \"-B[START_DIR]/armhf_sysroot/bin\", \"-B[START_DIR]/armhf_sysroot/gcc-cross\", \"-L[START_DIR]/armhf_sysroot/gcc-cross\", \"-L[START_DIR]/armhf_sysroot/lib\", \"-L[START_DIR]/chromebook_arm_gles/lib\"] is_debug=false skia_use_egl=true skia_use_fontconfig=false skia_use_system_freetype2=false target_cpu=\"arm\"" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/armhf_sysroot/lib", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm-Release-Chromebook_GLES" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm-Release-Chromebook_GLES" }, "name": "gn gen" }, @@ -147,17 +147,17 @@ "-k", "0", "-C", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm-Release-Chromebook_GLES/Release", + "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm-Release-Chromebook_GLES/Release", "nanobench", "dm" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/armhf_sysroot/lib", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm-Release-Chromebook_GLES" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm-Release-Chromebook_GLES" }, "name": "ninja" }, @@ -166,7 +166,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.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", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm-Release-Chromebook_GLES/Release", + "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm-Release-Chromebook_GLES/Release", "[START_DIR]/[SWARM_OUT_DIR]/out/Release" ], "infra_step": true, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android.json index d599a982a7..0b45c75184 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android.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]" @@ -101,7 +101,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/android_ndk_linux/VERSION", + "[START_DIR]/cache/work/skia/infra/bots/assets/android_ndk_linux/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -111,31 +111,31 @@ "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", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm64-Release-Android" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm64-Release-Android" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", + "[START_DIR]/cache/work/skia/bin/gn", "gen", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm64-Release-Android/Release", + "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm64-Release-Android/Release", "--args=extra_cflags=[\"-DDUMMY_ndk_version=42\"] is_debug=false ndk=\"[START_DIR]/android_ndk_linux\" target_cpu=\"arm64\"" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm64-Release-Android" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm64-Release-Android" }, "name": "gn gen" }, @@ -145,14 +145,14 @@ "-k", "0", "-C", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm64-Release-Android/Release" + "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm64-Release-Android/Release" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm64-Release-Android" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm64-Release-Android" }, "name": "ninja" }, @@ -161,7 +161,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.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", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm64-Release-Android/Release", + "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm64-Release-Android/Release", "[START_DIR]/[SWARM_OUT_DIR]/out/Release" ], "infra_step": true, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android_ASAN.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android_ASAN.json index 0289a8c90a..d85851881a 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android_ASAN.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android_ASAN.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]" @@ -101,7 +101,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/android_ndk_linux/VERSION", + "[START_DIR]/cache/work/skia/infra/bots/assets/android_ndk_linux/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -111,31 +111,31 @@ "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", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm64-Release-Android_ASAN" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm64-Release-Android_ASAN" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", + "[START_DIR]/cache/work/skia/bin/gn", "gen", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm64-Release-Android_ASAN/Release", + "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm64-Release-Android_ASAN/Release", "--args=extra_cflags=[\"-DDUMMY_ndk_version=42\"] is_debug=false ndk=\"[START_DIR]/android_ndk_linux\" sanitize=\"ASAN\" target_cpu=\"arm64\"" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm64-Release-Android_ASAN" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm64-Release-Android_ASAN" }, "name": "gn gen" }, @@ -145,14 +145,14 @@ "-k", "0", "-C", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm64-Release-Android_ASAN/Release" + "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm64-Release-Android_ASAN/Release" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm64-Release-Android_ASAN" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm64-Release-Android_ASAN" }, "name": "ninja" }, @@ -161,7 +161,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.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", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm64-Release-Android_ASAN/Release", + "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm64-Release-Android_ASAN/Release", "[START_DIR]/[SWARM_OUT_DIR]/out/Release" ], "infra_step": true, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android_Vulkan.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android_Vulkan.json index 33caf89374..cc1e4d6378 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android_Vulkan.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android_Vulkan.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]" @@ -101,7 +101,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/android_ndk_linux/VERSION", + "[START_DIR]/cache/work/skia/infra/bots/assets/android_ndk_linux/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -111,31 +111,31 @@ "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", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm64-Release-Android_Vulkan" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm64-Release-Android_Vulkan" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", + "[START_DIR]/cache/work/skia/bin/gn", "gen", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm64-Release-Android_Vulkan/Release", + "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm64-Release-Android_Vulkan/Release", "--args=extra_cflags=[\"-DDUMMY_ndk_version=42\"] is_debug=false ndk=\"[START_DIR]/android_ndk_linux\" ndk_api=24 skia_enable_vulkan_debug_layers=false target_cpu=\"arm64\"" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm64-Release-Android_Vulkan" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm64-Release-Android_Vulkan" }, "name": "gn gen" }, @@ -145,14 +145,14 @@ "-k", "0", "-C", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm64-Release-Android_Vulkan/Release" + "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm64-Release-Android_Vulkan/Release" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm64-Release-Android_Vulkan" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm64-Release-Android_Vulkan" }, "name": "ninja" }, @@ -161,7 +161,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.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", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm64-Release-Android_Vulkan/Release", + "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm64-Release-Android_Vulkan/Release", "[START_DIR]/[SWARM_OUT_DIR]/out/Release" ], "infra_step": true, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-ASAN.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-ASAN.json index a37663135b..c98221e26b 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-ASAN.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-ASAN.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]" @@ -101,7 +101,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, @@ -111,31 +111,31 @@ "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", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-ASAN" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-ASAN" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", + "[START_DIR]/cache/work/skia/bin/gn", "gen", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-ASAN/Debug", + "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-ASAN/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\"] sanitize=\"ASAN\" skia_enable_spirv_validation=false target_cpu=\"x86_64\"" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-ASAN" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-ASAN" }, "name": "gn gen" }, @@ -145,14 +145,14 @@ "-k", "0", "-C", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-ASAN/Debug" + "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-ASAN/Debug" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-ASAN" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-ASAN" }, "name": "ninja" }, @@ -161,7 +161,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.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", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-ASAN/Debug", + "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-ASAN/Debug", "[START_DIR]/[SWARM_OUT_DIR]/out/Debug" ], "infra_step": true, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-Coverage.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-Coverage.json index f39e749913..2d431b9441 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-Coverage.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-Coverage.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]" @@ -101,7 +101,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, @@ -111,31 +111,31 @@ "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", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-Coverage" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-Coverage" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", + "[START_DIR]/cache/work/skia/bin/gn", "gen", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-Coverage/Debug", + "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-Coverage/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\", \"-fprofile-instr-generate\", \"-fcoverage-mapping\", \"-O1\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-fprofile-instr-generate\", \"-fcoverage-mapping\"] target_cpu=\"x86_64\"" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-Coverage" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-Coverage" }, "name": "gn gen" }, @@ -145,14 +145,14 @@ "-k", "0", "-C", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-Coverage/Debug" + "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-Coverage/Debug" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-Coverage" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-Coverage" }, "name": "ninja" }, @@ -161,7 +161,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.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", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-Coverage/Debug", + "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-Coverage/Debug", "[START_DIR]/[SWARM_OUT_DIR]/out/Debug" ], "infra_step": true, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-MSAN.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-MSAN.json index 2e6cc03228..c56489e070 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-MSAN.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-MSAN.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]" @@ -101,7 +101,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, @@ -111,31 +111,31 @@ "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", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-MSAN" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-MSAN" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", + "[START_DIR]/cache/work/skia/bin/gn", "gen", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-MSAN/Debug", + "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-MSAN/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\", \"-L[START_DIR]/clang_linux/msan\"] sanitize=\"MSAN\" skia_enable_gpu=false skia_use_fontconfig=false target_cpu=\"x86_64\"" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-MSAN" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-MSAN" }, "name": "gn gen" }, @@ -145,14 +145,14 @@ "-k", "0", "-C", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-MSAN/Debug" + "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-MSAN/Debug" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-MSAN" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-MSAN" }, "name": "ninja" }, @@ -161,7 +161,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.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", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-MSAN/Debug", + "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-MSAN/Debug", "[START_DIR]/[SWARM_OUT_DIR]/out/Debug" ], "infra_step": true, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json index 3d768982e8..0e7a0773f9 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.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]" @@ -101,7 +101,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, @@ -111,31 +111,31 @@ "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", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", + "[START_DIR]/cache/work/skia/bin/gn", "gen", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE/Debug", + "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE/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\", \"-DSK_USE_DISCARDABLE_SCALEDIMAGECACHE\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\"] target_cpu=\"x86_64\"" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE" }, "name": "gn gen" }, @@ -145,14 +145,14 @@ "-k", "0", "-C", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE/Debug" + "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE/Debug" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE" }, "name": "ninja" }, @@ -161,7 +161,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.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", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE/Debug", + "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE/Debug", "[START_DIR]/[SWARM_OUT_DIR]/out/Debug" ], "infra_step": true, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug.json index 4609686176..04a40898b2 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug.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]" @@ -101,7 +101,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, @@ -111,31 +111,31 @@ "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", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", + "[START_DIR]/cache/work/skia/bin/gn", "gen", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug/Debug", + "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug/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\"] target_cpu=\"x86_64\"" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug" }, "name": "gn gen" }, @@ -145,14 +145,14 @@ "-k", "0", "-C", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug/Debug" + "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug/Debug" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug" }, "name": "ninja" }, @@ -161,7 +161,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.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", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug/Debug", + "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug/Debug", "[START_DIR]/[SWARM_OUT_DIR]/out/Debug" ], "infra_step": true, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES.json index baeb043392..9b04276e12 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES.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]" @@ -101,7 +101,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, @@ -111,31 +111,31 @@ "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", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", + "[START_DIR]/cache/work/skia/bin/gn", "gen", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES/Release", + "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES/Release", "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_asmflags=[] extra_cflags=[\"-DMESA_EGL_NO_X11_HEADERS\", \"-I[START_DIR]/chromebook_x86_64_gles/include\", \"-DDUMMY_clang_linux_version=42\"] extra_ldflags=[\"-L[START_DIR]/chromebook_x86_64_gles/lib\", \"-static-libstdc++\", \"-static-libgcc\", \"-fuse-ld=lld\"] is_debug=false skia_use_egl=true skia_use_fontconfig=false skia_use_system_freetype2=false target_cpu=\"x86_64\"" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES" }, "name": "gn gen" }, @@ -145,16 +145,16 @@ "-k", "0", "-C", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES/Release", + "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES/Release", "nanobench", "dm" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES" }, "name": "ninja" }, @@ -163,7 +163,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.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", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES/Release", + "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES/Release", "[START_DIR]/[SWARM_OUT_DIR]/out/Release" ], "infra_step": true, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Fast.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Fast.json index c6401011a0..6eba4867c2 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Fast.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Fast.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]" @@ -101,7 +101,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, @@ -111,31 +111,31 @@ "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", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Fast" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Fast" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", + "[START_DIR]/cache/work/skia/bin/gn", "gen", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Fast/Release", + "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Fast/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\", \"-march=native\", \"-fomit-frame-pointer\", \"-O3\", \"-ffp-contract=off\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\"] is_debug=false target_cpu=\"x86_64\"" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Fast" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Fast" }, "name": "gn gen" }, @@ -145,14 +145,14 @@ "-k", "0", "-C", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Fast/Release" + "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Fast/Release" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Fast" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Fast" }, "name": "ninja" }, @@ -161,7 +161,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.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", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Fast/Release", + "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Fast/Release", "[START_DIR]/[SWARM_OUT_DIR]/out/Release" ], "infra_step": true, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Mini.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Mini.json index c68d6efc05..ec5c41e3fa 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Mini.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Mini.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]" @@ -101,7 +101,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, @@ -111,31 +111,31 @@ "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", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Mini" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Mini" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", + "[START_DIR]/cache/work/skia/bin/gn", "gen", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Mini/Release", + "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Mini/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\"] is_component_build=true is_debug=false is_official_build=true skia_enable_effects=false skia_enable_gpu=true skia_enable_pdf=false skia_use_expat=false skia_use_libjpeg_turbo=false skia_use_libpng=false skia_use_libwebp=false skia_use_zlib=false target_cpu=\"x86_64\"" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Mini" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Mini" }, "name": "gn gen" }, @@ -145,14 +145,14 @@ "-k", "0", "-C", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Mini/Release" + "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Mini/Release" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Mini" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Mini" }, "name": "ninja" }, @@ -161,7 +161,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.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", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Mini/Release", + "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Mini/Release", "[START_DIR]/[SWARM_OUT_DIR]/out/Release" ], "infra_step": true, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Vulkan.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Vulkan.json index ef650cb57e..683e5ff031 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Vulkan.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Vulkan.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]" @@ -101,7 +101,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, @@ -111,31 +111,31 @@ "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", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", + "[START_DIR]/cache/work/skia/bin/gn", "gen", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan/Release", + "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan/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\"] is_debug=false skia_enable_vulkan_debug_layers=false skia_vulkan_sdk=\"[START_DIR]/linux_vulkan_sdk\" target_cpu=\"x86_64\"" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan" }, "name": "gn gen" }, @@ -145,14 +145,14 @@ "-k", "0", "-C", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan/Release" + "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan/Release" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan" }, "name": "ninja" }, @@ -161,7 +161,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.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", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan/Release", + "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan/Release", "[START_DIR]/[SWARM_OUT_DIR]/out/Release" ], "infra_step": true, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Vulkan_Coverage.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Vulkan_Coverage.json index dd557b5bc1..692ed1096f 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Vulkan_Coverage.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Vulkan_Coverage.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]" @@ -101,7 +101,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, @@ -111,31 +111,31 @@ "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", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan_Coverage" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan_Coverage" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", + "[START_DIR]/cache/work/skia/bin/gn", "gen", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan_Coverage/Release", + "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan_Coverage/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\", \"-fprofile-instr-generate\", \"-fcoverage-mapping\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-fprofile-instr-generate\", \"-fcoverage-mapping\"] is_debug=false skia_enable_vulkan_debug_layers=false skia_vulkan_sdk=\"[START_DIR]/linux_vulkan_sdk\" target_cpu=\"x86_64\"" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan_Coverage" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan_Coverage" }, "name": "gn gen" }, @@ -145,14 +145,14 @@ "-k", "0", "-C", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan_Coverage/Release" + "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan_Coverage/Release" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan_Coverage" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan_Coverage" }, "name": "ninja" }, @@ -161,7 +161,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.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", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan_Coverage/Release", + "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan_Coverage/Release", "[START_DIR]/[SWARM_OUT_DIR]/out/Release" ], "infra_step": true, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-EMCC-wasm-Release.json b/infra/bots/recipes/compile.expected/Build-Debian9-EMCC-wasm-Release.json index 99b1593c2c..828a82a3ff 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-EMCC-wasm-Release.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-EMCC-wasm-Release.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]" @@ -101,7 +101,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/emscripten_sdk/VERSION", + "[START_DIR]/cache/work/skia/infra/bots/assets/emscripten_sdk/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -111,31 +111,31 @@ "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", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-EMCC-wasm-Release" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-EMCC-wasm-Release" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", + "[START_DIR]/cache/work/skia/bin/gn", "gen", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-EMCC-wasm-Release/Release", + "[START_DIR]/cache/work/skia/out/Build-Debian9-EMCC-wasm-Release/Release", "--args=cc=\"[START_DIR]/emscripten_sdk/emscripten/incoming/emcc\" cxx=\"[START_DIR]/emscripten_sdk/emscripten/incoming/em++\" extra_cflags=[\"-Wno-unknown-warning-option\", \"-DDUMMY_emscripten_sdk_version=42\"] is_debug=false skia_enable_gpu=false skia_use_dng_sdk=false skia_use_fontconfig=false skia_use_freetype=false skia_use_icu=false target_cpu=\"wasm\"" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "[START_DIR]/emscripten_sdk/clang/fastcomp/build_incoming_64/bin:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-EMCC-wasm-Release" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-EMCC-wasm-Release" }, "name": "gn gen" }, @@ -145,14 +145,14 @@ "-k", "0", "-C", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-EMCC-wasm-Release/Release" + "[START_DIR]/cache/work/skia/out/Build-Debian9-EMCC-wasm-Release/Release" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "[START_DIR]/emscripten_sdk/clang/fastcomp/build_incoming_64/bin:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-EMCC-wasm-Release" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-EMCC-wasm-Release" }, "name": "ninja" }, @@ -161,7 +161,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.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", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-EMCC-wasm-Release/Release", + "[START_DIR]/cache/work/skia/out/Build-Debian9-EMCC-wasm-Release/Release", "[START_DIR]/[SWARM_OUT_DIR]/out/Release" ], "infra_step": true, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-arm-Release-Chromecast.json b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-arm-Release-Chromecast.json index 32fcb01603..e9a935e4c2 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-arm-Release-Chromecast.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-arm-Release-Chromecast.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]" @@ -101,7 +101,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/cast_toolchain/VERSION", + "[START_DIR]/cache/work/skia/infra/bots/assets/cast_toolchain/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -111,31 +111,31 @@ "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", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-arm-Release-Chromecast" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-arm-Release-Chromecast" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", + "[START_DIR]/cache/work/skia/bin/gn", "gen", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-arm-Release-Chromecast/Release", + "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-arm-Release-Chromecast/Release", "--args=ar=\"[START_DIR]/cast_toolchain/armv7a/bin/armv7a-cros-linux-gnueabi-ar\" cc=\"[START_DIR]/cast_toolchain/armv7a/bin/armv7a-cros-linux-gnueabi-gcc\" cxx=\"[START_DIR]/cast_toolchain/armv7a/bin/armv7a-cros-linux-gnueabi-g++\" extra_cflags=[\"-I[START_DIR]/chromebook_arm_gles/include\", \"-DMESA_EGL_NO_X11_HEADERS\", \"-DSK_NO_COMMAND_BUFFER\", \"-Wno-error=unused-function\", \"-g0\", \"-DDUMMY_cast_toolchain_version=42\"] extra_ldflags=[\"-static-libstdc++\", \"-static-libgcc\", \"-L[START_DIR]/cast_toolchain/armv7a/lib\"] is_debug=false skia_enable_gpu=true skia_use_egl=true skia_use_fontconfig=false skia_use_icu=false skia_use_system_freetype2=false target_cpu=\"arm\"" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-arm-Release-Chromecast" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-arm-Release-Chromecast" }, "name": "gn gen" }, @@ -145,16 +145,16 @@ "-k", "0", "-C", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-arm-Release-Chromecast/Release", + "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-arm-Release-Chromecast/Release", "nanobench", "dm" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-arm-Release-Chromecast" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-arm-Release-Chromecast" }, "name": "ninja" }, @@ -163,7 +163,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.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", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-arm-Release-Chromecast/Release", + "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-arm-Release-Chromecast/Release", "[START_DIR]/[SWARM_OUT_DIR]/out/Release" ], "infra_step": true, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86-Debug.json b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86-Debug.json index 0988830980..488a3d400d 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86-Debug.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86-Debug.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]" @@ -97,31 +97,31 @@ "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", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86-Debug" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86-Debug" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", + "[START_DIR]/cache/work/skia/bin/gn", "gen", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86-Debug/Debug", + "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86-Debug/Debug", "--args=cc=\"gcc\" cxx=\"g++\" extra_cflags=[\"-O1\"] target_cpu=\"x86\"" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86-Debug" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86-Debug" }, "name": "gn gen" }, @@ -131,14 +131,14 @@ "-k", "0", "-C", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86-Debug/Debug" + "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86-Debug/Debug" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86-Debug" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86-Debug" }, "name": "ninja" }, @@ -147,7 +147,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.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", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86-Debug/Debug", + "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86-Debug/Debug", "[START_DIR]/[SWARM_OUT_DIR]/out/Debug" ], "infra_step": true, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Debug-NoGPU.json b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Debug-NoGPU.json index 0c64b0cba0..184ad85069 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Debug-NoGPU.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Debug-NoGPU.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]" @@ -97,31 +97,31 @@ "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", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Debug-NoGPU" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Debug-NoGPU" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", + "[START_DIR]/cache/work/skia/bin/gn", "gen", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Debug-NoGPU/Debug", + "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Debug-NoGPU/Debug", "--args=cc=\"gcc\" cxx=\"g++\" extra_cflags=[\"-O1\"] skia_enable_gpu=false target_cpu=\"x86_64\"" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Debug-NoGPU" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Debug-NoGPU" }, "name": "gn gen" }, @@ -131,14 +131,14 @@ "-k", "0", "-C", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Debug-NoGPU/Debug" + "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Debug-NoGPU/Debug" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Debug-NoGPU" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Debug-NoGPU" }, "name": "ninja" }, @@ -147,7 +147,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.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", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Debug-NoGPU/Debug", + "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Debug-NoGPU/Debug", "[START_DIR]/[SWARM_OUT_DIR]/out/Debug" ], "infra_step": true, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-ANGLE.json b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-ANGLE.json index 28197f8e70..2ddf353a64 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-ANGLE.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-ANGLE.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]" @@ -97,31 +97,31 @@ "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", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Release-ANGLE" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Release-ANGLE" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", + "[START_DIR]/cache/work/skia/bin/gn", "gen", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Release-ANGLE/Release", + "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Release-ANGLE/Release", "--args=cc=\"gcc\" cxx=\"g++\" is_debug=false skia_use_angle=true target_cpu=\"x86_64\"" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Release-ANGLE" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Release-ANGLE" }, "name": "gn gen" }, @@ -131,14 +131,14 @@ "-k", "0", "-C", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Release-ANGLE/Release" + "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Release-ANGLE/Release" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Release-ANGLE" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Release-ANGLE" }, "name": "ninja" }, @@ -147,7 +147,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.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", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Release-ANGLE/Release", + "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Release-ANGLE/Release", "[START_DIR]/[SWARM_OUT_DIR]/out/Release" ], "infra_step": true, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-Flutter_Android.json b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-Flutter_Android.json index 9cc8e47e89..a824cfa38f 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-Flutter_Android.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-Flutter_Android.json @@ -9,7 +9,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/flutter" + "[START_DIR]/cache/work/flutter" ], "infra_step": true, "name": "makedirs checkout_path" @@ -22,10 +22,10 @@ "--json-output", "/path/to/tmp/json", "remove", - "[CUSTOM_/_B_WORK]/flutter/.gclient_entries" + "[START_DIR]/cache/work/flutter/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/flutter/.gclient_entries" + "name": "remove [START_DIR]/cache/work/flutter/.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': True, 'name': 'src/flutter', 'url': 'https://github.com/flutter/engine.git'}]\ntarget_os = ['android']", + "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src/flutter', 'url': 'https://github.com/flutter/engine.git'}]\ntarget_os = ['android']", "--patch_root", "src/third_party/skia", "--revision_mapping_file", "{\"got_flutter_revision\": \"src/flutter\", \"got_revision\": \"src/third_party/skia\"}", "--git-cache-dir", - "[CUSTOM_/_B_CACHE]", + "[START_DIR]/cache/git", "--cleanup-dir", "[CLEANUP]/bot_update", "--output_json", @@ -49,7 +49,7 @@ "--revision", "src/third_party/skia@abc123" ], - "cwd": "[CUSTOM_/_B_WORK]/flutter", + "cwd": "[START_DIR]/cache/work/flutter", "env_prefixes": { "PATH": [ "RECIPE_PACKAGE_REPO[depot_tools]" @@ -117,7 +117,7 @@ "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", "runhooks" ], - "cwd": "[CUSTOM_/_B_WORK]/flutter/src", + "cwd": "[START_DIR]/cache/work/flutter/src", "env": { "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -131,9 +131,9 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/flutter/src/out/android_release" + "[START_DIR]/cache/work/flutter/src/out/android_release" ], - "cwd": "[CUSTOM_/_B_WORK]/flutter/src", + "cwd": "[START_DIR]/cache/work/flutter/src", "infra_step": true, "name": "rmtree android_release" }, @@ -143,12 +143,12 @@ "--runtime-mode=release", "--android" ], - "cwd": "[CUSTOM_/_B_WORK]/flutter/src", + "cwd": "[START_DIR]/cache/work/flutter/src", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/flutter/src/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-Flutter_Android" + "SKIA_OUT": "[START_DIR]/cache/work/flutter/src/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-Flutter_Android" }, "name": "gn_gen" }, @@ -159,12 +159,12 @@ "out/android_release", "-j100" ], - "cwd": "[CUSTOM_/_B_WORK]/flutter/src", + "cwd": "[START_DIR]/cache/work/flutter/src", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/flutter/src/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-Flutter_Android" + "SKIA_OUT": "[START_DIR]/cache/work/flutter/src/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-Flutter_Android" }, "name": "build_flutter" }, @@ -173,7 +173,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.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", - "[CUSTOM_/_B_WORK]/flutter/src/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-Flutter_Android/Release", + "[START_DIR]/cache/work/flutter/src/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-Flutter_Android/Release", "[START_DIR]/[SWARM_OUT_DIR]/out/Release" ], "infra_step": true, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-PDFium.json b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-PDFium.json index 2592241d42..b14dd5668d 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-PDFium.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-PDFium.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': True, 'name': 'pdfium', 'url': 'https://pdfium.googlesource.com/pdfium.git'}]", + "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'pdfium', 'url': 'https://pdfium.googlesource.com/pdfium.git'}]", "--patch_root", "pdfium/third_party/skia", "--revision_mapping_file", "{\"got_pdfium_revision\": \"pdfium\", \"got_revision\": \"pdfium/third_party/skia\"}", "--git-cache-dir", - "[CUSTOM_/_B_CACHE]", + "[START_DIR]/cache/git", "--cleanup-dir", "[CLEANUP]/bot_update", "--output_json", @@ -49,7 +49,7 @@ "--revision", "pdfium/third_party/skia@abc123" ], - "cwd": "[CUSTOM_/_B_WORK]", + "cwd": "[START_DIR]/cache/work", "env_prefixes": { "PATH": [ "RECIPE_PACKAGE_REPO[depot_tools]" @@ -117,7 +117,7 @@ "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", "runhooks" ], - "cwd": "[CUSTOM_/_B_WORK]/pdfium", + "cwd": "[START_DIR]/cache/work/pdfium", "env": { "DEPOT_TOOLS_UPDATE": "0", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" @@ -130,13 +130,13 @@ "build/linux/sysroot_scripts/install-sysroot.py", "--arch=amd64" ], - "cwd": "[CUSTOM_/_B_WORK]/pdfium", + "cwd": "[START_DIR]/cache/work/pdfium", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "DEPOT_TOOLS_UPDATE": "0", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium" + "SKIA_OUT": "[START_DIR]/cache/work/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium" }, "name": "sysroot" }, @@ -147,14 +147,14 @@ "out/skia", "--args=pdf_is_standalone=true clang_use_chrome_plugins=false is_component_build=false is_debug=false pdf_use_skia=true" ], - "cwd": "[CUSTOM_/_B_WORK]/pdfium", + "cwd": "[START_DIR]/cache/work/pdfium", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools", + "CHROMIUM_BUILDTOOLS_PATH": "[START_DIR]/cache/work/pdfium/buildtools", "DEPOT_TOOLS_UPDATE": "0", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium" + "SKIA_OUT": "[START_DIR]/cache/work/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium" }, "name": "gn_gen" }, @@ -165,14 +165,14 @@ "out/skia", "-j100" ], - "cwd": "[CUSTOM_/_B_WORK]/pdfium", + "cwd": "[START_DIR]/cache/work/pdfium", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools", + "CHROMIUM_BUILDTOOLS_PATH": "[START_DIR]/cache/work/pdfium/buildtools", "DEPOT_TOOLS_UPDATE": "0", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium" + "SKIA_OUT": "[START_DIR]/cache/work/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium" }, "name": "build_pdfium" }, @@ -181,7 +181,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.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", - "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium/Release", + "[START_DIR]/cache/work/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium/Release", "[START_DIR]/[SWARM_OUT_DIR]/out/Release" ], "infra_step": true, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths.json b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths.json index 434c6b1539..c643894325 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths.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': True, 'name': 'pdfium', 'url': 'https://pdfium.googlesource.com/pdfium.git'}]", + "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'pdfium', 'url': 'https://pdfium.googlesource.com/pdfium.git'}]", "--patch_root", "pdfium/third_party/skia", "--revision_mapping_file", "{\"got_pdfium_revision\": \"pdfium\", \"got_revision\": \"pdfium/third_party/skia\"}", "--git-cache-dir", - "[CUSTOM_/_B_CACHE]", + "[START_DIR]/cache/git", "--cleanup-dir", "[CLEANUP]/bot_update", "--output_json", @@ -49,7 +49,7 @@ "--revision", "pdfium/third_party/skia@abc123" ], - "cwd": "[CUSTOM_/_B_WORK]", + "cwd": "[START_DIR]/cache/work", "env_prefixes": { "PATH": [ "RECIPE_PACKAGE_REPO[depot_tools]" @@ -117,7 +117,7 @@ "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", "runhooks" ], - "cwd": "[CUSTOM_/_B_WORK]/pdfium", + "cwd": "[START_DIR]/cache/work/pdfium", "env": { "DEPOT_TOOLS_UPDATE": "0", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" @@ -130,13 +130,13 @@ "build/linux/sysroot_scripts/install-sysroot.py", "--arch=amd64" ], - "cwd": "[CUSTOM_/_B_WORK]/pdfium", + "cwd": "[START_DIR]/cache/work/pdfium", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "DEPOT_TOOLS_UPDATE": "0", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths" + "SKIA_OUT": "[START_DIR]/cache/work/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths" }, "name": "sysroot" }, @@ -147,14 +147,14 @@ "out/skia", "--args=pdf_is_standalone=true clang_use_chrome_plugins=false is_component_build=false is_debug=false pdf_use_skia_paths=true" ], - "cwd": "[CUSTOM_/_B_WORK]/pdfium", + "cwd": "[START_DIR]/cache/work/pdfium", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools", + "CHROMIUM_BUILDTOOLS_PATH": "[START_DIR]/cache/work/pdfium/buildtools", "DEPOT_TOOLS_UPDATE": "0", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths" + "SKIA_OUT": "[START_DIR]/cache/work/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths" }, "name": "gn_gen" }, @@ -165,14 +165,14 @@ "out/skia", "-j100" ], - "cwd": "[CUSTOM_/_B_WORK]/pdfium", + "cwd": "[START_DIR]/cache/work/pdfium", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools", + "CHROMIUM_BUILDTOOLS_PATH": "[START_DIR]/cache/work/pdfium/buildtools", "DEPOT_TOOLS_UPDATE": "0", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths" + "SKIA_OUT": "[START_DIR]/cache/work/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths" }, "name": "build_pdfium" }, @@ -181,7 +181,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.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", - "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths/Release", + "[START_DIR]/cache/work/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths/Release", "[START_DIR]/[SWARM_OUT_DIR]/out/Release" ], "infra_step": true, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-Shared.json b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-Shared.json index 3dc69c4661..6bfeb1fabb 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-Shared.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-Shared.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]" @@ -97,31 +97,31 @@ "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", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Release-Shared" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Release-Shared" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", + "[START_DIR]/cache/work/skia/bin/gn", "gen", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Release-Shared/Release", + "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Release-Shared/Release", "--args=cc=\"gcc\" cxx=\"g++\" is_component_build=true is_debug=false target_cpu=\"x86_64\"" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Release-Shared" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Release-Shared" }, "name": "gn gen" }, @@ -131,14 +131,14 @@ "-k", "0", "-C", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Release-Shared/Release" + "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Release-Shared/Release" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Release-Shared" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Release-Shared" }, "name": "ninja" }, @@ -147,7 +147,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.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", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Release-Shared/Release", + "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Release-Shared/Release", "[START_DIR]/[SWARM_OUT_DIR]/out/Release" ], "infra_step": true, diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-Android.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-Android.json index 5947f190cc..f6b6839b0f 100644 --- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-Android.json +++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-Android.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]" @@ -101,7 +101,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/android_ndk_darwin/VERSION", + "[START_DIR]/cache/work/skia/infra/bots/assets/android_ndk_darwin/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -111,31 +111,31 @@ "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", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-Android" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-arm64-Debug-Android" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", + "[START_DIR]/cache/work/skia/bin/gn", "gen", - "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-Android/Debug", + "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-arm64-Debug-Android/Debug", "--args=extra_cflags=[\"-O1\", \"-DDUMMY_ndk_version=42\"] ndk=\"[START_DIR]/android_ndk_darwin\" target_cpu=\"arm64\"" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-Android" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-arm64-Debug-Android" }, "name": "gn gen" }, @@ -145,14 +145,14 @@ "-k", "0", "-C", - "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-Android/Debug" + "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-arm64-Debug-Android/Debug" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-Android" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-arm64-Debug-Android" }, "name": "ninja" }, @@ -161,7 +161,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.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", - "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-Android/Debug", + "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-arm64-Debug-Android/Debug", "[START_DIR]/[SWARM_OUT_DIR]/out/Debug" ], "infra_step": true, diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-iOS.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-iOS.json index d011552022..6cb43df8d9 100644 --- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-iOS.json +++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-iOS.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]" @@ -97,31 +97,31 @@ "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", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-iOS" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-arm64-Debug-iOS" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", + "[START_DIR]/cache/work/skia/bin/gn", "gen", - "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-iOS/Debug", + "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-arm64-Debug-iOS/Debug", "--args=cc=\"clang\" cxx=\"clang++\" extra_cflags=[\"-O1\"] skia_ios_identity=\".*GS9WA.*\" skia_ios_profile=\"Upstream Testing Provisioning Profile\" target_cpu=\"arm64\" target_os=\"ios\"" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-iOS" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-arm64-Debug-iOS" }, "name": "gn gen" }, @@ -131,14 +131,14 @@ "-k", "0", "-C", - "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-iOS/Debug" + "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-arm64-Debug-iOS/Debug" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-iOS" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-arm64-Debug-iOS" }, "name": "ninja" }, @@ -147,7 +147,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.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", - "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-iOS/Debug", + "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-arm64-Debug-iOS/Debug", "[START_DIR]/[SWARM_OUT_DIR]/out/Debug" ], "infra_step": true, diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x64-Release-iOS.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x64-Release-iOS.json index 952ba1327a..5ba5ef217f 100644 --- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x64-Release-iOS.json +++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x64-Release-iOS.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]" @@ -97,31 +97,31 @@ "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", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x64-Release-iOS" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x64-Release-iOS" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", + "[START_DIR]/cache/work/skia/bin/gn", "gen", - "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x64-Release-iOS/Release", + "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x64-Release-iOS/Release", "--args=cc=\"clang\" cxx=\"clang++\" is_debug=false skia_ios_identity=\".*GS9WA.*\" skia_ios_profile=\"Upstream Testing Provisioning Profile\" target_cpu=\"x64\" target_os=\"ios\"" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x64-Release-iOS" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x64-Release-iOS" }, "name": "gn gen" }, @@ -131,14 +131,14 @@ "-k", "0", "-C", - "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x64-Release-iOS/Release" + "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x64-Release-iOS/Release" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x64-Release-iOS" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x64-Release-iOS" }, "name": "ninja" }, @@ -147,7 +147,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.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", - "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x64-Release-iOS/Release", + "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x64-Release-iOS/Release", "[START_DIR]/[SWARM_OUT_DIR]/out/Release" ], "infra_step": true, diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json index 9a1bd71949..0f05d1410f 100644 --- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json +++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.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'}, {'deps_file': '.DEPS.git', 'managed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]", + "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}, {'deps_file': '.DEPS.git', 'managed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.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", @@ -49,7 +49,7 @@ "--revision", "src@origin/lkcr" ], - "cwd": "[CUSTOM_/_B_WORK]", + "cwd": "[START_DIR]/cache/work", "env_prefixes": { "PATH": [ "RECIPE_PACKAGE_REPO[depot_tools]" @@ -103,7 +103,7 @@ "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", "runhooks" ], - "cwd": "[CUSTOM_/_B_WORK]", + "cwd": "[START_DIR]/cache/work", "env": { "DEPOT_TOOLS_UPDATE": "0", "GYP_CHROMIUM_NO_ACTION": "0", @@ -115,11 +115,11 @@ "cmd": [ "python", "-u", - "[CUSTOM_/_B_WORK]/skia/tools/build_command_buffer.py", + "[START_DIR]/cache/work/skia/tools/build_command_buffer.py", "--chrome-dir", - "[CUSTOM_/_B_WORK]", + "[START_DIR]/cache/work", "--output-dir", - "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer/Debug", + "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer/Debug", "--no-sync", "--no-hooks", "--make-output-dir" @@ -128,7 +128,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer" }, "name": "build command_buffer" }, @@ -136,31 +136,31 @@ "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", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", + "[START_DIR]/cache/work/skia/bin/gn", "gen", - "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer/Debug", + "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer/Debug", "--args=cc=\"clang\" cxx=\"clang++\" extra_cflags=[\"-O1\"] target_cpu=\"x86_64\"" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer" }, "name": "gn gen" }, @@ -170,14 +170,14 @@ "-k", "0", "-C", - "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer/Debug" + "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer/Debug" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer" }, "name": "ninja" }, @@ -186,7 +186,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.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", - "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer/Debug", + "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer/Debug", "[START_DIR]/[SWARM_OUT_DIR]/out/Debug" ], "infra_step": true, diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Release.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Release.json index f4eb37af08..f949ec89e3 100644 --- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Release.json +++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Release.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]" @@ -97,31 +97,31 @@ "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", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Release" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Release" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", + "[START_DIR]/cache/work/skia/bin/gn", "gen", - "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Release/Release", + "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Release/Release", "--args=cc=\"clang\" cxx=\"clang++\" is_debug=false target_cpu=\"x86_64\"" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Release" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Release" }, "name": "gn gen" }, @@ -131,14 +131,14 @@ "-k", "0", "-C", - "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Release/Release" + "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Release/Release" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Release" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Release" }, "name": "ninja" }, @@ -147,7 +147,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.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", - "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Release/Release", + "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Release/Release", "[START_DIR]/[SWARM_OUT_DIR]/out/Release" ], "infra_step": true, diff --git a/infra/bots/recipes/compile.expected/Build-Win-Clang-arm64-Release-Android.json b/infra/bots/recipes/compile.expected/Build-Win-Clang-arm64-Release-Android.json index 77b178832f..22a2bbf0eb 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-Clang-arm64-Release-Android.json +++ b/infra/bots/recipes/compile.expected/Build-Win-Clang-arm64-Release-Android.json @@ -9,7 +9,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_C:\\_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_C:\\_B_WORK]\\.gclient_entries" + "[START_DIR]\\cache\\work\\.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_C:\\_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_C:\\\\_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_C:\\_B_CACHE]", + "[START_DIR]\\cache\\git", "--cleanup-dir", "[CLEANUP]\\bot_update", "--output_json", @@ -47,7 +47,7 @@ "--revision", "skia@abc123" ], - "cwd": "[CUSTOM_C:\\_B_WORK]", + "cwd": "[START_DIR]\\cache\\work", "env_prefixes": { "PATH": [ "RECIPE_PACKAGE_REPO[depot_tools]" @@ -101,7 +101,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[CUSTOM_C:\\_B_WORK]\\skia\\infra\\bots\\assets\\android_ndk_windows\\VERSION", + "[START_DIR]\\cache\\work\\skia\\infra\\bots\\assets\\android_ndk_windows\\VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -111,31 +111,31 @@ "cmd": [ "python", "-u", - "[CUSTOM_C:\\_B_WORK]\\skia\\bin\\fetch-gn" + "[START_DIR]\\cache\\work\\skia\\bin\\fetch-gn" ], - "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "cwd": "[START_DIR]\\cache\\work\\skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-arm64-Release-Android" + "SKIA_OUT": "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-arm64-Release-Android" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[CUSTOM_C:\\_B_WORK]\\skia\\bin\\gn.exe", + "[START_DIR]\\cache\\work\\skia\\bin\\gn.exe", "gen", - "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-arm64-Release-Android\\Release", + "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-arm64-Release-Android\\Release", "--args=extra_cflags=[\"-DDUMMY_ndk_version=42\"] is_debug=false ndk=\"[START_DIR]\\n\" target_cpu=\"arm64\"" ], - "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "cwd": "[START_DIR]\\cache\\work\\skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-arm64-Release-Android" + "SKIA_OUT": "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-arm64-Release-Android" }, "name": "gn gen" }, @@ -145,14 +145,14 @@ "-k", "0", "-C", - "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-arm64-Release-Android\\Release" + "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-arm64-Release-Android\\Release" ], - "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "cwd": "[START_DIR]\\cache\\work\\skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-arm64-Release-Android" + "SKIA_OUT": "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-arm64-Release-Android" }, "name": "ninja" }, @@ -161,7 +161,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.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", - "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-arm64-Release-Android\\Release", + "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-arm64-Release-Android\\Release", "[START_DIR]\\[SWARM_OUT_DIR]\\out\\Release" ], "infra_step": true, diff --git a/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug-Exceptions.json b/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug-Exceptions.json index 3f2c05a1b7..81800fb00d 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug-Exceptions.json +++ b/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug-Exceptions.json @@ -9,7 +9,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_C:\\_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_C:\\_B_WORK]\\.gclient_entries" + "[START_DIR]\\cache\\work\\.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_C:\\_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_C:\\\\_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_C:\\_B_CACHE]", + "[START_DIR]\\cache\\git", "--cleanup-dir", "[CLEANUP]\\bot_update", "--output_json", @@ -47,7 +47,7 @@ "--revision", "skia@abc123" ], - "cwd": "[CUSTOM_C:\\_B_WORK]", + "cwd": "[START_DIR]\\cache\\work", "env_prefixes": { "PATH": [ "RECIPE_PACKAGE_REPO[depot_tools]" @@ -101,7 +101,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[CUSTOM_C:\\_B_WORK]\\skia\\infra\\bots\\assets\\clang_win\\VERSION", + "[START_DIR]\\cache\\work\\skia\\infra\\bots\\assets\\clang_win\\VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -111,31 +111,31 @@ "cmd": [ "python", "-u", - "[CUSTOM_C:\\_B_WORK]\\skia\\bin\\fetch-gn" + "[START_DIR]\\cache\\work\\skia\\bin\\fetch-gn" ], - "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "cwd": "[START_DIR]\\cache\\work\\skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86-Debug-Exceptions" + "SKIA_OUT": "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86-Debug-Exceptions" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[CUSTOM_C:\\_B_WORK]\\skia\\bin\\gn.exe", + "[START_DIR]\\cache\\work\\skia\\bin\\gn.exe", "gen", - "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86-Debug-Exceptions\\Debug", + "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86-Debug-Exceptions\\Debug", "--args=cc=\"clang\" clang_win=\"[START_DIR]\\clang_win\" cxx=\"clang++\" extra_cflags=[\"-O1\", \"/EHsc\", \"-DDUMMY_clang_win_version=42\"] target_cpu=\"x86\" win_sdk=\"[START_DIR]\\t\\depot_tools\\win_toolchain\\vs_files\\a9e1098bba66d2acccc377d5ee81265910f29272/win_sdk\" win_vc=\"[START_DIR]\\t\\depot_tools\\win_toolchain\\vs_files\\a9e1098bba66d2acccc377d5ee81265910f29272/VC\"" ], - "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "cwd": "[START_DIR]\\cache\\work\\skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86-Debug-Exceptions" + "SKIA_OUT": "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86-Debug-Exceptions" }, "name": "gn gen" }, @@ -145,14 +145,14 @@ "-k", "0", "-C", - "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86-Debug-Exceptions\\Debug" + "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86-Debug-Exceptions\\Debug" ], - "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "cwd": "[START_DIR]\\cache\\work\\skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86-Debug-Exceptions" + "SKIA_OUT": "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86-Debug-Exceptions" }, "name": "ninja" }, @@ -161,7 +161,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.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", - "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86-Debug-Exceptions\\Debug", + "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86-Debug-Exceptions\\Debug", "[START_DIR]\\[SWARM_OUT_DIR]\\out\\Debug" ], "infra_step": true, diff --git a/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug.json b/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug.json index 74e4687d5c..57f5008026 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug.json +++ b/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug.json @@ -9,7 +9,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_C:\\_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_C:\\_B_WORK]\\.gclient_entries" + "[START_DIR]\\cache\\work\\.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_C:\\_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_C:\\\\_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_C:\\_B_CACHE]", + "[START_DIR]\\cache\\git", "--cleanup-dir", "[CLEANUP]\\bot_update", "--output_json", @@ -47,7 +47,7 @@ "--revision", "skia@abc123" ], - "cwd": "[CUSTOM_C:\\_B_WORK]", + "cwd": "[START_DIR]\\cache\\work", "env_prefixes": { "PATH": [ "RECIPE_PACKAGE_REPO[depot_tools]" @@ -101,7 +101,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[CUSTOM_C:\\_B_WORK]\\skia\\infra\\bots\\assets\\clang_win\\VERSION", + "[START_DIR]\\cache\\work\\skia\\infra\\bots\\assets\\clang_win\\VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -111,31 +111,31 @@ "cmd": [ "python", "-u", - "[CUSTOM_C:\\_B_WORK]\\skia\\bin\\fetch-gn" + "[START_DIR]\\cache\\work\\skia\\bin\\fetch-gn" ], - "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "cwd": "[START_DIR]\\cache\\work\\skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86-Debug" + "SKIA_OUT": "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86-Debug" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[CUSTOM_C:\\_B_WORK]\\skia\\bin\\gn.exe", + "[START_DIR]\\cache\\work\\skia\\bin\\gn.exe", "gen", - "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86-Debug\\Debug", + "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86-Debug\\Debug", "--args=cc=\"clang\" clang_win=\"[START_DIR]\\clang_win\" cxx=\"clang++\" extra_cflags=[\"-O1\", \"-DDUMMY_clang_win_version=42\"] target_cpu=\"x86\" win_sdk=\"[START_DIR]\\t\\depot_tools\\win_toolchain\\vs_files\\a9e1098bba66d2acccc377d5ee81265910f29272/win_sdk\" win_vc=\"[START_DIR]\\t\\depot_tools\\win_toolchain\\vs_files\\a9e1098bba66d2acccc377d5ee81265910f29272/VC\"" ], - "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "cwd": "[START_DIR]\\cache\\work\\skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86-Debug" + "SKIA_OUT": "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86-Debug" }, "name": "gn gen" }, @@ -145,14 +145,14 @@ "-k", "0", "-C", - "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86-Debug\\Debug" + "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86-Debug\\Debug" ], - "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "cwd": "[START_DIR]\\cache\\work\\skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86-Debug" + "SKIA_OUT": "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86-Debug" }, "name": "ninja" }, @@ -161,7 +161,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.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", - "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86-Debug\\Debug", + "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86-Debug\\Debug", "[START_DIR]\\[SWARM_OUT_DIR]\\out\\Debug" ], "infra_step": true, diff --git a/infra/bots/recipes/compile.expected/Build-Win-Clang-x86_64-Debug-ANGLE.json b/infra/bots/recipes/compile.expected/Build-Win-Clang-x86_64-Debug-ANGLE.json index 04ec5b0bde..70fd9b6c3a 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-Clang-x86_64-Debug-ANGLE.json +++ b/infra/bots/recipes/compile.expected/Build-Win-Clang-x86_64-Debug-ANGLE.json @@ -9,7 +9,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_C:\\_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_C:\\_B_WORK]\\.gclient_entries" + "[START_DIR]\\cache\\work\\.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_C:\\_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_C:\\\\_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_C:\\_B_CACHE]", + "[START_DIR]\\cache\\git", "--cleanup-dir", "[CLEANUP]\\bot_update", "--output_json", @@ -47,7 +47,7 @@ "--revision", "skia@abc123" ], - "cwd": "[CUSTOM_C:\\_B_WORK]", + "cwd": "[START_DIR]\\cache\\work", "env_prefixes": { "PATH": [ "RECIPE_PACKAGE_REPO[depot_tools]" @@ -101,7 +101,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[CUSTOM_C:\\_B_WORK]\\skia\\infra\\bots\\assets\\clang_win\\VERSION", + "[START_DIR]\\cache\\work\\skia\\infra\\bots\\assets\\clang_win\\VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -111,31 +111,31 @@ "cmd": [ "python", "-u", - "[CUSTOM_C:\\_B_WORK]\\skia\\bin\\fetch-gn" + "[START_DIR]\\cache\\work\\skia\\bin\\fetch-gn" ], - "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "cwd": "[START_DIR]\\cache\\work\\skia", "env": { "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86_64-Debug-ANGLE" + "SKIA_OUT": "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86_64-Debug-ANGLE" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[CUSTOM_C:\\_B_WORK]\\skia\\bin\\gn.exe", + "[START_DIR]\\cache\\work\\skia\\bin\\gn.exe", "gen", - "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86_64-Debug-ANGLE\\Debug_x64", + "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86_64-Debug-ANGLE\\Debug_x64", "--args=cc=\"clang\" clang_win=\"[START_DIR]\\clang_win\" cxx=\"clang++\" extra_cflags=[\"-O1\", \"-DDUMMY_clang_win_version=42\"] skia_use_angle=true target_cpu=\"x86_64\" win_sdk=\"[START_DIR]\\t\\depot_tools\\win_toolchain\\vs_files\\a9e1098bba66d2acccc377d5ee81265910f29272/win_sdk\" win_vc=\"[START_DIR]\\t\\depot_tools\\win_toolchain\\vs_files\\a9e1098bba66d2acccc377d5ee81265910f29272/VC\"" ], - "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "cwd": "[START_DIR]\\cache\\work\\skia", "env": { "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86_64-Debug-ANGLE" + "SKIA_OUT": "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86_64-Debug-ANGLE" }, "name": "gn gen" }, @@ -145,14 +145,14 @@ "-k", "0", "-C", - "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86_64-Debug-ANGLE\\Debug_x64" + "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86_64-Debug-ANGLE\\Debug_x64" ], - "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "cwd": "[START_DIR]\\cache\\work\\skia", "env": { "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86_64-Debug-ANGLE" + "SKIA_OUT": "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86_64-Debug-ANGLE" }, "name": "ninja" }, @@ -161,7 +161,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.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", - "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86_64-Debug-ANGLE\\Debug_x64", + "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86_64-Debug-ANGLE\\Debug_x64", "[START_DIR]\\[SWARM_OUT_DIR]\\out\\Debug_x64" ], "infra_step": true, diff --git a/infra/bots/recipes/compile.expected/Build-Win-Clang-x86_64-Release-Vulkan.json b/infra/bots/recipes/compile.expected/Build-Win-Clang-x86_64-Release-Vulkan.json index 9c662d0a46..bbd857c4e6 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-Clang-x86_64-Release-Vulkan.json +++ b/infra/bots/recipes/compile.expected/Build-Win-Clang-x86_64-Release-Vulkan.json @@ -9,7 +9,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_C:\\_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_C:\\_B_WORK]\\.gclient_entries" + "[START_DIR]\\cache\\work\\.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_C:\\_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_C:\\\\_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_C:\\_B_CACHE]", + "[START_DIR]\\cache\\git", "--cleanup-dir", "[CLEANUP]\\bot_update", "--output_json", @@ -47,7 +47,7 @@ "--revision", "skia@abc123" ], - "cwd": "[CUSTOM_C:\\_B_WORK]", + "cwd": "[START_DIR]\\cache\\work", "env_prefixes": { "PATH": [ "RECIPE_PACKAGE_REPO[depot_tools]" @@ -101,7 +101,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[CUSTOM_C:\\_B_WORK]\\skia\\infra\\bots\\assets\\clang_win\\VERSION", + "[START_DIR]\\cache\\work\\skia\\infra\\bots\\assets\\clang_win\\VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -111,31 +111,31 @@ "cmd": [ "python", "-u", - "[CUSTOM_C:\\_B_WORK]\\skia\\bin\\fetch-gn" + "[START_DIR]\\cache\\work\\skia\\bin\\fetch-gn" ], - "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "cwd": "[START_DIR]\\cache\\work\\skia", "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86_64-Release-Vulkan" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[CUSTOM_C:\\_B_WORK]\\skia\\bin\\gn.exe", + "[START_DIR]\\cache\\work\\skia\\bin\\gn.exe", "gen", - "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86_64-Release-Vulkan\\Release_x64", + "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86_64-Release-Vulkan\\Release_x64", "--args=cc=\"clang\" clang_win=\"[START_DIR]\\clang_win\" cxx=\"clang++\" extra_cflags=[\"-DDUMMY_clang_win_version=42\"] is_debug=false skia_enable_vulkan_debug_layers=false skia_vulkan_sdk=\"[START_DIR]\\win_vulkan_sdk\" target_cpu=\"x86_64\" win_sdk=\"[START_DIR]\\t\\depot_tools\\win_toolchain\\vs_files\\a9e1098bba66d2acccc377d5ee81265910f29272/win_sdk\" win_vc=\"[START_DIR]\\t\\depot_tools\\win_toolchain\\vs_files\\a9e1098bba66d2acccc377d5ee81265910f29272/VC\"" ], - "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "cwd": "[START_DIR]\\cache\\work\\skia", "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "gn gen" }, @@ -145,14 +145,14 @@ "-k", "0", "-C", - "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86_64-Release-Vulkan\\Release_x64" + "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86_64-Release-Vulkan\\Release_x64" ], - "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "cwd": "[START_DIR]\\cache\\work\\skia", "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "ninja" }, @@ -161,7 +161,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.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", - "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86_64-Release-Vulkan\\Release_x64", + "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86_64-Release-Vulkan\\Release_x64", "[START_DIR]\\[SWARM_OUT_DIR]\\out\\Release_x64" ], "infra_step": true, diff --git a/infra/bots/recipes/compile.expected/alternate_repo.json b/infra/bots/recipes/compile.expected/alternate_repo.json index 1f2410ca26..570c282e5e 100644 --- a/infra/bots/recipes/compile.expected/alternate_repo.json +++ b/infra/bots/recipes/compile.expected/alternate_repo.json @@ -9,7 +9,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_C:\\_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_C:\\_B_WORK]/.gclient_entries" + "[START_DIR]/cache/work/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_C:\\_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_C:\\\\_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'other_repo', 'url': 'https://skia.googlesource.com/other_repo.git'}]", + "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'other_repo', 'url': 'https://skia.googlesource.com/other_repo.git'}]", "--patch_root", "other_repo", "--revision_mapping_file", "{\"got_revision\": \"other_repo\"}", "--git-cache-dir", - "[CUSTOM_C:\\_B_CACHE]", + "[START_DIR]/cache/git", "--cleanup-dir", "[CLEANUP]/bot_update", "--output_json", @@ -47,7 +47,7 @@ "--revision", "other_repo@abc123" ], - "cwd": "[CUSTOM_C:\\_B_WORK]", + "cwd": "[START_DIR]/cache/work", "env_prefixes": { "PATH": [ "RECIPE_PACKAGE_REPO[depot_tools]" @@ -101,7 +101,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[CUSTOM_C:\\_B_WORK]/skia/infra/bots/assets/clang_win/VERSION", + "[START_DIR]/cache/work/skia/infra/bots/assets/clang_win/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -111,31 +111,31 @@ "cmd": [ "python", "-u", - "[CUSTOM_C:\\_B_WORK]/skia/bin/fetch-gn" + "[START_DIR]/cache/work/skia/bin/fetch-gn" ], - "cwd": "[CUSTOM_C:\\_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[CUSTOM_C:\\_B_WORK]/skia/bin/gn.exe", + "[START_DIR]/cache/work/skia/bin/gn.exe", "gen", - "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan/Release_x64", + "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan/Release_x64", "--args=cc=\"clang\" clang_win=\"[START_DIR]/clang_win\" cxx=\"clang++\" extra_cflags=[\"-DDUMMY_clang_win_version=42\"] is_debug=false skia_enable_vulkan_debug_layers=false skia_vulkan_sdk=\"[START_DIR]/win_vulkan_sdk\" target_cpu=\"x86_64\" win_sdk=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/a9e1098bba66d2acccc377d5ee81265910f29272/win_sdk\" win_vc=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/a9e1098bba66d2acccc377d5ee81265910f29272/VC\"" ], - "cwd": "[CUSTOM_C:\\_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "gn gen" }, @@ -145,14 +145,14 @@ "-k", "0", "-C", - "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan/Release_x64" + "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan/Release_x64" ], - "cwd": "[CUSTOM_C:\\_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "ninja" }, @@ -161,7 +161,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.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", - "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan/Release_x64", + "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan/Release_x64", "[START_DIR]/[SWARM_OUT_DIR]/out/Release_x64" ], "infra_step": true, diff --git a/infra/bots/recipes/compile.expected/flutter_trybot.json b/infra/bots/recipes/compile.expected/flutter_trybot.json index 5f8cc36499..69c2d1c35e 100644 --- a/infra/bots/recipes/compile.expected/flutter_trybot.json +++ b/infra/bots/recipes/compile.expected/flutter_trybot.json @@ -9,7 +9,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_B_WORK]/flutter" + "[START_DIR]/cache/work/flutter" ], "infra_step": true, "name": "makedirs checkout_path" @@ -22,10 +22,10 @@ "--json-output", "/path/to/tmp/json", "remove", - "[CUSTOM_/_B_WORK]/flutter/.gclient_entries" + "[START_DIR]/cache/work/flutter/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/flutter/.gclient_entries" + "name": "remove [START_DIR]/cache/work/flutter/.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': True, 'name': 'src/flutter', 'url': 'https://github.com/flutter/engine.git'}]\ntarget_os = ['android']", + "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src/flutter', 'url': 'https://github.com/flutter/engine.git'}]\ntarget_os = ['android']", "--patch_root", "src/third_party/skia", "--revision_mapping_file", "{\"got_flutter_revision\": \"src/flutter\", \"got_revision\": \"src/third_party/skia\"}", "--git-cache-dir", - "[CUSTOM_/_B_CACHE]", + "[START_DIR]/cache/git", "--cleanup-dir", "[CLEANUP]/bot_update", "--gerrit_repo", @@ -53,7 +53,7 @@ "--revision", "src/third_party/skia@abc123" ], - "cwd": "[CUSTOM_/_B_WORK]/flutter", + "cwd": "[START_DIR]/cache/work/flutter", "env_prefixes": { "PATH": [ "RECIPE_PACKAGE_REPO[depot_tools]" @@ -121,7 +121,7 @@ "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", "runhooks" ], - "cwd": "[CUSTOM_/_B_WORK]/flutter/src", + "cwd": "[START_DIR]/cache/work/flutter/src", "env": { "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -135,9 +135,9 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_/_B_WORK]/flutter/src/out/android_release" + "[START_DIR]/cache/work/flutter/src/out/android_release" ], - "cwd": "[CUSTOM_/_B_WORK]/flutter/src", + "cwd": "[START_DIR]/cache/work/flutter/src", "infra_step": true, "name": "rmtree android_release" }, @@ -147,12 +147,12 @@ "--runtime-mode=release", "--android" ], - "cwd": "[CUSTOM_/_B_WORK]/flutter/src", + "cwd": "[START_DIR]/cache/work/flutter/src", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/flutter/src/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-Flutter_Android" + "SKIA_OUT": "[START_DIR]/cache/work/flutter/src/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-Flutter_Android" }, "name": "gn_gen" }, @@ -163,12 +163,12 @@ "out/android_release", "-j100" ], - "cwd": "[CUSTOM_/_B_WORK]/flutter/src", + "cwd": "[START_DIR]/cache/work/flutter/src", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/flutter/src/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-Flutter_Android" + "SKIA_OUT": "[START_DIR]/cache/work/flutter/src/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-Flutter_Android" }, "name": "build_flutter" }, @@ -177,7 +177,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.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", - "[CUSTOM_/_B_WORK]/flutter/src/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-Flutter_Android/Release", + "[START_DIR]/cache/work/flutter/src/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-Flutter_Android/Release", "[START_DIR]/[SWARM_OUT_DIR]/out/Release" ], "infra_step": true, diff --git a/infra/bots/recipes/compile.expected/pdfium_trybot.json b/infra/bots/recipes/compile.expected/pdfium_trybot.json index d4fbbcfa1b..737c92b7e6 100644 --- a/infra/bots/recipes/compile.expected/pdfium_trybot.json +++ b/infra/bots/recipes/compile.expected/pdfium_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': True, 'name': 'pdfium', 'url': 'https://pdfium.googlesource.com/pdfium.git'}]", + "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'pdfium', 'url': 'https://pdfium.googlesource.com/pdfium.git'}]", "--patch_root", "pdfium/third_party/skia", "--revision_mapping_file", "{\"got_pdfium_revision\": \"pdfium\", \"got_revision\": \"pdfium/third_party/skia\"}", "--git-cache-dir", - "[CUSTOM_/_B_CACHE]", + "[START_DIR]/cache/git", "--cleanup-dir", "[CLEANUP]/bot_update", "--gerrit_repo", @@ -53,7 +53,7 @@ "--revision", "pdfium/third_party/skia@abc123" ], - "cwd": "[CUSTOM_/_B_WORK]", + "cwd": "[START_DIR]/cache/work", "env_prefixes": { "PATH": [ "RECIPE_PACKAGE_REPO[depot_tools]" @@ -121,7 +121,7 @@ "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", "runhooks" ], - "cwd": "[CUSTOM_/_B_WORK]/pdfium", + "cwd": "[START_DIR]/cache/work/pdfium", "env": { "DEPOT_TOOLS_UPDATE": "0", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" @@ -134,13 +134,13 @@ "build/linux/sysroot_scripts/install-sysroot.py", "--arch=amd64" ], - "cwd": "[CUSTOM_/_B_WORK]/pdfium", + "cwd": "[START_DIR]/cache/work/pdfium", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "DEPOT_TOOLS_UPDATE": "0", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium" + "SKIA_OUT": "[START_DIR]/cache/work/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium" }, "name": "sysroot" }, @@ -151,14 +151,14 @@ "out/skia", "--args=pdf_is_standalone=true clang_use_chrome_plugins=false is_component_build=false is_debug=false pdf_use_skia=true" ], - "cwd": "[CUSTOM_/_B_WORK]/pdfium", + "cwd": "[START_DIR]/cache/work/pdfium", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools", + "CHROMIUM_BUILDTOOLS_PATH": "[START_DIR]/cache/work/pdfium/buildtools", "DEPOT_TOOLS_UPDATE": "0", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium" + "SKIA_OUT": "[START_DIR]/cache/work/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium" }, "name": "gn_gen" }, @@ -169,14 +169,14 @@ "out/skia", "-j100" ], - "cwd": "[CUSTOM_/_B_WORK]/pdfium", + "cwd": "[START_DIR]/cache/work/pdfium", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools", + "CHROMIUM_BUILDTOOLS_PATH": "[START_DIR]/cache/work/pdfium/buildtools", "DEPOT_TOOLS_UPDATE": "0", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium" + "SKIA_OUT": "[START_DIR]/cache/work/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium" }, "name": "build_pdfium" }, @@ -185,7 +185,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.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", - "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium/Release", + "[START_DIR]/cache/work/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium/Release", "[START_DIR]/[SWARM_OUT_DIR]/out/Release" ], "infra_step": true, diff --git a/infra/bots/recipes/compile.expected/trybot.json b/infra/bots/recipes/compile.expected/trybot.json index 6c30e1a347..d1728a19fb 100644 --- a/infra/bots/recipes/compile.expected/trybot.json +++ b/infra/bots/recipes/compile.expected/trybot.json @@ -9,7 +9,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_C:\\_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_C:\\_B_WORK]/.gclient_entries" + "[START_DIR]/cache/work/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_C:\\_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_C:\\\\_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_C:\\_B_CACHE]", + "[START_DIR]/cache/git", "--cleanup-dir", "[CLEANUP]/bot_update", "--gerrit_repo", @@ -51,7 +51,7 @@ "--revision", "skia@abc123" ], - "cwd": "[CUSTOM_C:\\_B_WORK]", + "cwd": "[START_DIR]/cache/work", "env_prefixes": { "PATH": [ "RECIPE_PACKAGE_REPO[depot_tools]" @@ -105,7 +105,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[CUSTOM_C:\\_B_WORK]/skia/infra/bots/assets/clang_win/VERSION", + "[START_DIR]/cache/work/skia/infra/bots/assets/clang_win/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -115,31 +115,31 @@ "cmd": [ "python", "-u", - "[CUSTOM_C:\\_B_WORK]/skia/bin/fetch-gn" + "[START_DIR]/cache/work/skia/bin/fetch-gn" ], - "cwd": "[CUSTOM_C:\\_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[CUSTOM_C:\\_B_WORK]/skia/bin/gn.exe", + "[START_DIR]/cache/work/skia/bin/gn.exe", "gen", - "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan/Release_x64", + "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan/Release_x64", "--args=cc=\"clang\" clang_win=\"[START_DIR]/clang_win\" cxx=\"clang++\" extra_cflags=[\"-DDUMMY_clang_win_version=42\"] is_debug=false skia_enable_vulkan_debug_layers=false skia_vulkan_sdk=\"[START_DIR]/win_vulkan_sdk\" target_cpu=\"x86_64\" win_sdk=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/a9e1098bba66d2acccc377d5ee81265910f29272/win_sdk\" win_vc=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/a9e1098bba66d2acccc377d5ee81265910f29272/VC\"" ], - "cwd": "[CUSTOM_C:\\_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "gn gen" }, @@ -149,14 +149,14 @@ "-k", "0", "-C", - "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan/Release_x64" + "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan/Release_x64" ], - "cwd": "[CUSTOM_C:\\_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "ninja" }, @@ -165,7 +165,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.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", - "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan/Release_x64", + "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan/Release_x64", "[START_DIR]/[SWARM_OUT_DIR]/out/Release_x64" ], "infra_step": true, diff --git a/infra/bots/recipes/ct_skps.py b/infra/bots/recipes/ct_skps.py index 85f6ce8080..d0864d52fd 100644 --- a/infra/bots/recipes/ct_skps.py +++ b/infra/bots/recipes/ct_skps.py @@ -40,6 +40,13 @@ TOOL_TO_DEFAULT_SKPS_PER_SLAVE = { DEFAULT_SKPS_CHROMIUM_BUILD = '2b7e85eb251dc7-a3cf3659ed2c08' +def make_path(api, *path): + """Return a Path object for the given path.""" + key = 'custom_%s' % '_'.join(path) + api.path.c.base_paths[key] = tuple(path) + return api.path[key] + + def RunSteps(api): # Figure out which repository to use. buildername = api.properties['buildername'] @@ -71,6 +78,9 @@ def RunSteps(api): else: raise Exception('Do not recognise the buildername %s.' % buildername) + api.vars.override_checkout_root = make_path(api, '/', 'b', 'work') + api.vars.override_gclient_cache = make_path(api, '/', 'b', 'cache') + api.core.setup() api.flavor.compile(build_target) diff --git a/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json b/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json index 161047a5db..c9a214fafd 100644 --- a/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json +++ b/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-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]" @@ -124,7 +124,7 @@ "0777", "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Housekeeper-PerCommit/data" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "infra_step": true, "name": "makedirs perf_dir" }, @@ -141,7 +141,7 @@ "--issue_number", "456789" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", diff --git a/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit.json b/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit.json index c7cfb77fc2..099d0a74f7 100644 --- a/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit.json +++ b/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit.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]" @@ -113,7 +113,7 @@ "python", "RECIPE_MODULE[skia::core]/resources/generate_and_upload_doxygen.py" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", @@ -134,7 +134,7 @@ "0777", "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Housekeeper-PerCommit/data" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "infra_step": true, "name": "makedirs perf_dir" }, @@ -149,7 +149,7 @@ "--dest", "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Housekeeper-PerCommit/data/nanobench_9046e2e693bb92a76e972b694580e5d17ad10748_1337000001.json" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", diff --git a/infra/bots/recipes/infra.expected/failed_all_updates.json b/infra/bots/recipes/infra.expected/failed_all_updates.json index 4b29cb9beb..c8086c0234 100644 --- a/infra/bots/recipes/infra.expected/failed_all_updates.json +++ b/infra/bots/recipes/infra.expected/failed_all_updates.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]" diff --git a/infra/bots/recipes/infra.expected/failed_one_update.json b/infra/bots/recipes/infra.expected/failed_one_update.json index 4e3b09e266..9a53e59043 100644 --- a/infra/bots/recipes/infra.expected/failed_one_update.json +++ b/infra/bots/recipes/infra.expected/failed_one_update.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]" @@ -170,7 +170,7 @@ "infra/bots", "test" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", diff --git a/infra/bots/recipes/infra.expected/infra_tests.json b/infra/bots/recipes/infra.expected/infra_tests.json index f86eb5e7c6..7464a16695 100644 --- a/infra/bots/recipes/infra.expected/infra_tests.json +++ b/infra/bots/recipes/infra.expected/infra_tests.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]" @@ -148,7 +148,7 @@ "infra/bots", "test" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", diff --git a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json index ac899f285e..55863cd4f2 100644 --- a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json +++ b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.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'}, {'deps_file': '.DEPS.git', 'managed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]", + "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}, {'deps_file': '.DEPS.git', 'managed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.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", @@ -49,7 +49,7 @@ "--revision", "src@origin/lkcr" ], - "cwd": "[CUSTOM_/_B_WORK]", + "cwd": "[START_DIR]/cache/work", "env_prefixes": { "PATH": [ "RECIPE_PACKAGE_REPO[depot_tools]" @@ -103,7 +103,7 @@ "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", "runhooks" ], - "cwd": "[CUSTOM_/_B_WORK]", + "cwd": "[START_DIR]/cache/work", "env": { "CPPFLAGS": "-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1", "DEPOT_TOOLS_UPDATE": "0", @@ -128,11 +128,11 @@ }, { "cmd": [ - "[CUSTOM_/_B_WORK]/src/buildtools/linux64/gn", + "[START_DIR]/cache/work/src/buildtools/linux64/gn", "gen", - "[CUSTOM_/_B_WORK]/src/out/Release" + "[START_DIR]/cache/work/src/out/Release" ], - "cwd": "[CUSTOM_/_B_WORK]/src", + "cwd": "[START_DIR]/cache/work/src", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", @@ -147,10 +147,10 @@ "cmd": [ "ninja", "-C", - "[CUSTOM_/_B_WORK]/src/out/Release", + "[START_DIR]/cache/work/src/out/Release", "chrome" ], - "cwd": "[CUSTOM_/_B_WORK]/src", + "cwd": "[START_DIR]/cache/work/src", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", @@ -190,15 +190,15 @@ { "cmd": [ "python", - "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/skp/create.py", + "[START_DIR]/cache/work/skia/infra/bots/assets/skp/create.py", "--chrome_src_path", - "[CUSTOM_/_B_WORK]/src", + "[START_DIR]/cache/work/src", "--browser_executable", - "[CUSTOM_/_B_WORK]/src/out/Release/chrome", + "[START_DIR]/cache/work/src/out/Release/chrome", "--target_dir", "[START_DIR]/skp_output" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", diff --git a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json index 74af5ca935..b2a9b0e7ed 100644 --- a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json +++ b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.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'}, {'deps_file': '.DEPS.git', 'managed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]", + "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}, {'deps_file': '.DEPS.git', 'managed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.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", @@ -49,7 +49,7 @@ "--revision", "src@origin/lkcr" ], - "cwd": "[CUSTOM_/_B_WORK]", + "cwd": "[START_DIR]/cache/work", "env_prefixes": { "PATH": [ "RECIPE_PACKAGE_REPO[depot_tools]" @@ -103,7 +103,7 @@ "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", "runhooks" ], - "cwd": "[CUSTOM_/_B_WORK]", + "cwd": "[START_DIR]/cache/work", "env": { "CPPFLAGS": "-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1", "DEPOT_TOOLS_UPDATE": "0", @@ -128,11 +128,11 @@ }, { "cmd": [ - "[CUSTOM_/_B_WORK]/src/buildtools/linux64/gn", + "[START_DIR]/cache/work/src/buildtools/linux64/gn", "gen", - "[CUSTOM_/_B_WORK]/src/out/Release" + "[START_DIR]/cache/work/src/out/Release" ], - "cwd": "[CUSTOM_/_B_WORK]/src", + "cwd": "[START_DIR]/cache/work/src", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", @@ -147,10 +147,10 @@ "cmd": [ "ninja", "-C", - "[CUSTOM_/_B_WORK]/src/out/Release", + "[START_DIR]/cache/work/src/out/Release", "chrome" ], - "cwd": "[CUSTOM_/_B_WORK]/src", + "cwd": "[START_DIR]/cache/work/src", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", @@ -190,15 +190,15 @@ { "cmd": [ "python", - "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/skp/create.py", + "[START_DIR]/cache/work/skia/infra/bots/assets/skp/create.py", "--chrome_src_path", - "[CUSTOM_/_B_WORK]/src", + "[START_DIR]/cache/work/src", "--browser_executable", - "[CUSTOM_/_B_WORK]/src/out/Release/chrome", + "[START_DIR]/cache/work/src/out/Release/chrome", "--target_dir", "[START_DIR]/skp_output" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", @@ -258,11 +258,11 @@ { "cmd": [ "python", - "[CUSTOM_/_B_WORK]/skia/infra/bots/upload_skps.py", + "[START_DIR]/cache/work/skia/infra/bots/upload_skps.py", "--target_dir", "[START_DIR]/skp_output" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", diff --git a/infra/bots/recipes/recreate_skps.expected/failed_upload.json b/infra/bots/recipes/recreate_skps.expected/failed_upload.json index a8fe5b070b..d839cf0d6f 100644 --- a/infra/bots/recipes/recreate_skps.expected/failed_upload.json +++ b/infra/bots/recipes/recreate_skps.expected/failed_upload.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'}, {'deps_file': '.DEPS.git', 'managed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]", + "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}, {'deps_file': '.DEPS.git', 'managed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.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", @@ -49,7 +49,7 @@ "--revision", "src@origin/lkcr" ], - "cwd": "[CUSTOM_/_B_WORK]", + "cwd": "[START_DIR]/cache/work", "env_prefixes": { "PATH": [ "RECIPE_PACKAGE_REPO[depot_tools]" @@ -103,7 +103,7 @@ "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", "runhooks" ], - "cwd": "[CUSTOM_/_B_WORK]", + "cwd": "[START_DIR]/cache/work", "env": { "CPPFLAGS": "-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1", "DEPOT_TOOLS_UPDATE": "0", @@ -128,11 +128,11 @@ }, { "cmd": [ - "[CUSTOM_/_B_WORK]/src/buildtools/linux64/gn", + "[START_DIR]/cache/work/src/buildtools/linux64/gn", "gen", - "[CUSTOM_/_B_WORK]/src/out/Release" + "[START_DIR]/cache/work/src/out/Release" ], - "cwd": "[CUSTOM_/_B_WORK]/src", + "cwd": "[START_DIR]/cache/work/src", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", @@ -147,10 +147,10 @@ "cmd": [ "ninja", "-C", - "[CUSTOM_/_B_WORK]/src/out/Release", + "[START_DIR]/cache/work/src/out/Release", "chrome" ], - "cwd": "[CUSTOM_/_B_WORK]/src", + "cwd": "[START_DIR]/cache/work/src", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", @@ -190,15 +190,15 @@ { "cmd": [ "python", - "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/skp/create.py", + "[START_DIR]/cache/work/skia/infra/bots/assets/skp/create.py", "--chrome_src_path", - "[CUSTOM_/_B_WORK]/src", + "[START_DIR]/cache/work/src", "--browser_executable", - "[CUSTOM_/_B_WORK]/src/out/Release/chrome", + "[START_DIR]/cache/work/src/out/Release/chrome", "--target_dir", "[START_DIR]/skp_output" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", @@ -258,11 +258,11 @@ { "cmd": [ "python", - "[CUSTOM_/_B_WORK]/skia/infra/bots/upload_skps.py", + "[START_DIR]/cache/work/skia/infra/bots/upload_skps.py", "--target_dir", "[START_DIR]/skp_output" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", |