diff --git a/recipe_modules/bot_update/__init__.py b/recipe_modules/bot_update/__init__.py index b9020cad7a..11364c78f8 100644 --- a/recipe_modules/bot_update/__init__.py +++ b/recipe_modules/bot_update/__init__.py @@ -1,6 +1,5 @@ DEPS = [ 'gclient', - 'infra_paths', 'recipe_engine/json', 'recipe_engine/path', 'recipe_engine/platform', diff --git a/recipe_modules/bot_update/api.py b/recipe_modules/bot_update/api.py index 59ea24367c..8b3a35b0b8 100644 --- a/recipe_modules/bot_update/api.py +++ b/recipe_modules/bot_update/api.py @@ -119,9 +119,9 @@ class BotUpdateApi(recipe_api.RecipeApi): # Point to the oauth2 auth files if specified. # These paths are where the bots put their credential files. if patch_oauth2: - email_file = self.m.infra_paths['build'].join( + email_file = self.m.path['build'].join( 'site_config', '.rietveld_client_email') - key_file = self.m.infra_paths['build'].join( + key_file = self.m.path['build'].join( 'site_config', '.rietveld_secret_key') else: email_file = key_file = None @@ -276,7 +276,7 @@ class BotUpdateApi(recipe_api.RecipeApi): # first solution. if step_result.json.output['did_run']: co_root = step_result.json.output['root'] - cwd = kwargs.get('cwd', self.m.infra_paths['slave_build']) + cwd = kwargs.get('cwd', self.m.path['slave_build']) if 'checkout' not in self.m.path: self.m.path['checkout'] = cwd.join(*co_root.split(self.m.path.sep)) diff --git a/recipe_modules/bot_update/example.expected/trychange_oauth2.json b/recipe_modules/bot_update/example.expected/trychange_oauth2.json index ac7ae6c880..238a918ae6 100644 --- a/recipe_modules/bot_update/example.expected/trychange_oauth2.json +++ b/recipe_modules/bot_update/example.expected/trychange_oauth2.json @@ -19,9 +19,9 @@ "--git-cache-dir", "[GIT_CACHE]", "--apply_issue_email_file", - "[ROOT]/b/build/site_config/.rietveld_client_email", + "[BUILD]/site_config/.rietveld_client_email", "--apply_issue_key_file", - "[ROOT]/b/build/site_config/.rietveld_secret_key", + "[BUILD]/site_config/.rietveld_secret_key", "--output_json", "/path/to/tmp/json", "--revision", diff --git a/recipe_modules/bot_update/example.expected/tryjob_gerrit_angle.json b/recipe_modules/bot_update/example.expected/tryjob_gerrit_angle.json index 3ff687bafe..b4b7311f18 100644 --- a/recipe_modules/bot_update/example.expected/tryjob_gerrit_angle.json +++ b/recipe_modules/bot_update/example.expected/tryjob_gerrit_angle.json @@ -47,4 +47,4 @@ "recipe_result": null, "status_code": 0 } -] \ No newline at end of file +] diff --git a/recipe_modules/gclient/__init__.py b/recipe_modules/gclient/__init__.py index b9e022d85a..5d86f4dfb0 100644 --- a/recipe_modules/gclient/__init__.py +++ b/recipe_modules/gclient/__init__.py @@ -1,5 +1,4 @@ DEPS = [ - 'infra_paths', 'recipe_engine/json', 'recipe_engine/path', 'recipe_engine/platform', diff --git a/recipe_modules/gclient/api.py b/recipe_modules/gclient/api.py index 997e9b8623..6b44dab1d2 100644 --- a/recipe_modules/gclient/api.py +++ b/recipe_modules/gclient/api.py @@ -134,7 +134,7 @@ class GclientApi(recipe_api.RecipeApi): def get_config_defaults(self): return { 'USE_MIRROR': self.use_mirror, - 'CACHE_DIR': self.m.infra_paths['git_cache'], + 'CACHE_DIR': self.m.path['git_cache'], } @staticmethod @@ -276,7 +276,7 @@ class GclientApi(recipe_api.RecipeApi): self(name, ['recurse', 'git', 'config', var, val], **kwargs) finally: - cwd = kwargs.get('cwd', self.m.infra_paths['slave_build']) + cwd = kwargs.get('cwd', self.m.path['slave_build']) if 'checkout' not in self.m.path: self.m.path['checkout'] = cwd.join( *cfg.solutions[0].name.split(self.m.path.sep)) @@ -290,13 +290,9 @@ class GclientApi(recipe_api.RecipeApi): prefix = '%sgclient ' % (('[spec: %s] ' % alias) if alias else '') return self.m.python(prefix + 'revert', - self.m.infra_paths['build'].join( - 'scripts', 'slave', 'gclient_safe_revert.py'), - [ - '.', - self.m.infra_paths['depot_tools'].join( - 'gclient', platform_ext={'win': '.bat'}) - ], + self.m.path['build'].join('scripts', 'slave', 'gclient_safe_revert.py'), + ['.', self.m.path['depot_tools'].join('gclient', + platform_ext={'win': '.bat'})], infra_step=True, **kwargs ) @@ -338,7 +334,7 @@ class GclientApi(recipe_api.RecipeApi): print 'deleting %s' % path_to_file os.remove(path_to_file) """, - args=[self.m.infra_paths['slave_build']], + args=[self.m.path['slave_build']], infra_step=True, ) diff --git a/recipe_modules/gclient/example.expected/basic.json b/recipe_modules/gclient/example.expected/basic.json index 764ae46e0b..e1ce307c9d 100644 --- a/recipe_modules/gclient/example.expected/basic.json +++ b/recipe_modules/gclient/example.expected/basic.json @@ -89,9 +89,9 @@ "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", "config", "--spec", - "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'WebKit', 'safesync_url': 'https://blink-status.appspot.com/lkgr', 'url': 'svn://svn.chromium.org/blink/trunk'}]" + "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'WebKit', 'safesync_url': 'https://blink-status.appspot.com/lkgr', 'url': 'svn://svn.chromium.org/blink/trunk'}]" ], - "cwd": "[CWD]/src/third_party", + "cwd": "[SLAVE_BUILD]/src/third_party", "env": { "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -113,7 +113,7 @@ "--output-json", "/path/to/tmp/json" ], - "cwd": "[CWD]/src/third_party", + "cwd": "[SLAVE_BUILD]/src/third_party", "env": { "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -138,7 +138,7 @@ "python", "-u", "\nimport os, sys\n\nbuild_path = sys.argv[1]\nif os.path.exists(build_path):\n for (path, dir, files) in os.walk(build_path):\n for cur_file in files:\n if cur_file.endswith('index.lock'):\n path_to_file = os.path.join(path, cur_file)\n print 'deleting %s' % path_to_file\n os.remove(path_to_file)\n", - "[CWD]" + "[SLAVE_BUILD]" ], "cwd": "[SLAVE_BUILD]", "name": "cleanup index.lock", diff --git a/recipe_modules/gclient/example.expected/revision.json b/recipe_modules/gclient/example.expected/revision.json index 1a684ed214..e22717b420 100644 --- a/recipe_modules/gclient/example.expected/revision.json +++ b/recipe_modules/gclient/example.expected/revision.json @@ -91,9 +91,9 @@ "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", "config", "--spec", - "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'WebKit', 'safesync_url': 'https://blink-status.appspot.com/lkgr', 'url': 'svn://svn.chromium.org/blink/trunk'}]" + "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'WebKit', 'safesync_url': 'https://blink-status.appspot.com/lkgr', 'url': 'svn://svn.chromium.org/blink/trunk'}]" ], - "cwd": "[CWD]/src/third_party", + "cwd": "[SLAVE_BUILD]/src/third_party", "env": { "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -115,7 +115,7 @@ "--output-json", "/path/to/tmp/json" ], - "cwd": "[CWD]/src/third_party", + "cwd": "[SLAVE_BUILD]/src/third_party", "env": { "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -140,7 +140,7 @@ "python", "-u", "\nimport os, sys\n\nbuild_path = sys.argv[1]\nif os.path.exists(build_path):\n for (path, dir, files) in os.walk(build_path):\n for cur_file in files:\n if cur_file.endswith('index.lock'):\n path_to_file = os.path.join(path, cur_file)\n print 'deleting %s' % path_to_file\n os.remove(path_to_file)\n", - "[CWD]" + "[SLAVE_BUILD]" ], "cwd": "[SLAVE_BUILD]", "name": "cleanup index.lock", diff --git a/recipe_modules/gclient/example.expected/tryserver.json b/recipe_modules/gclient/example.expected/tryserver.json index 7d6fa5bc81..b22508d746 100644 --- a/recipe_modules/gclient/example.expected/tryserver.json +++ b/recipe_modules/gclient/example.expected/tryserver.json @@ -91,9 +91,9 @@ "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", "config", "--spec", - "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'WebKit', 'safesync_url': 'https://blink-status.appspot.com/lkgr', 'url': 'svn://svn.chromium.org/blink/trunk'}]" + "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'WebKit', 'safesync_url': 'https://blink-status.appspot.com/lkgr', 'url': 'svn://svn.chromium.org/blink/trunk'}]" ], - "cwd": "[CWD]/src/third_party", + "cwd": "[SLAVE_BUILD]/src/third_party", "env": { "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -103,11 +103,11 @@ "cmd": [ "python", "-u", - "[ROOT]/b/build/scripts/slave/gclient_safe_revert.py", + "[BUILD]/scripts/slave/gclient_safe_revert.py", ".", - "[ROOT]/b/depot_tools/gclient" + "[DEPOT_TOOLS]/gclient" ], - "cwd": "[CWD]/src/third_party", + "cwd": "[SLAVE_BUILD]/src/third_party", "name": "[spec: WebKit] gclient revert" }, { @@ -126,7 +126,7 @@ "--output-json", "/path/to/tmp/json" ], - "cwd": "[CWD]/src/third_party", + "cwd": "[SLAVE_BUILD]/src/third_party", "env": { "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -151,7 +151,7 @@ "python", "-u", "\nimport os, sys\n\nbuild_path = sys.argv[1]\nif os.path.exists(build_path):\n for (path, dir, files) in os.walk(build_path):\n for cur_file in files:\n if cur_file.endswith('index.lock'):\n path_to_file = os.path.join(path, cur_file)\n print 'deleting %s' % path_to_file\n os.remove(path_to_file)\n", - "[CWD]" + "[SLAVE_BUILD]" ], "cwd": "[SLAVE_BUILD]", "name": "cleanup index.lock", diff --git a/recipe_modules/gclient/example.py b/recipe_modules/gclient/example.py index 0713987caa..fa6daf8950 100644 --- a/recipe_modules/gclient/example.py +++ b/recipe_modules/gclient/example.py @@ -4,7 +4,6 @@ DEPS = [ 'gclient', - 'infra_paths', 'recipe_engine/path', 'recipe_engine/properties', ] @@ -82,7 +81,7 @@ def RunSteps(api): api.gclient.checkout( gclient_config=bl_cfg, with_branch_heads=True, - cwd=api.infra_paths['slave_build'].join('src', 'third_party')) + cwd=api.path['slave_build'].join('src', 'third_party')) api.gclient.break_locks() diff --git a/recipe_modules/git/__init__.py b/recipe_modules/git/__init__.py index 2dab849e99..c49ece3b4a 100644 --- a/recipe_modules/git/__init__.py +++ b/recipe_modules/git/__init__.py @@ -1,5 +1,4 @@ DEPS = [ - 'infra_paths', 'recipe_engine/path', 'recipe_engine/platform', 'recipe_engine/properties', diff --git a/recipe_modules/git/api.py b/recipe_modules/git/api.py index ba722b812d..1751c9622d 100644 --- a/recipe_modules/git/api.py +++ b/recipe_modules/git/api.py @@ -175,7 +175,7 @@ class GitApi(recipe_api.RecipeApi): # ex: ssh://host:repo/foobar/.git dir_path = dir_path or dir_path.rsplit('/', 1)[-1] - dir_path = self.m.infra_paths['slave_build'].join(dir_path) + dir_path = self.m.path['slave_build'].join(dir_path) if 'checkout' not in self.m.path: self.m.path['checkout'] = dir_path diff --git a/recipe_modules/git/example.expected/basic.json b/recipe_modules/git/example.expected/basic.json index 1ed8c1ac79..b332cdf605 100644 --- a/recipe_modules/git/example.expected/basic.json +++ b/recipe_modules/git/example.expected/basic.json @@ -5,7 +5,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[CWD]/src", + "[SLAVE_BUILD]/src", "--url", "https://chromium.googlesource.com/chromium/src.git" ], @@ -21,7 +21,7 @@ "master", "--recurse-submodules" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git fetch" }, { @@ -31,7 +31,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git checkout" }, { @@ -40,7 +40,7 @@ "rev-parse", "HEAD" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -55,7 +55,7 @@ "-d", "-x" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git clean" }, { @@ -64,7 +64,7 @@ "submodule", "sync" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "submodule sync" }, { @@ -75,7 +75,7 @@ "--init", "--recursive" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "submodule update" }, { @@ -86,7 +86,7 @@ "count-objects", "-v" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "count-objects", "stdout": "/path/to/tmp/" }, @@ -97,7 +97,7 @@ "--get", "remote.origin.url" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git config remote.origin.url", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -112,7 +112,7 @@ "--format=%at", "-s" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git show", "stdout": "/path/to/tmp/" }, @@ -123,7 +123,7 @@ "origin", "--tags" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git fetch tags" }, { @@ -131,7 +131,7 @@ "git", "status" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git status" }, { @@ -139,7 +139,7 @@ "git", "status" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git status can_fail_build" }, { @@ -147,7 +147,7 @@ "git", "status" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git status cannot_fail_build" }, { @@ -156,7 +156,7 @@ "rebase", "origin/master" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "my repo rebase" }, { @@ -164,10 +164,10 @@ "git", "bundle", "create", - "[CWD]/all.bundle", + "[SLAVE_BUILD]/all.bundle", "--all" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git bundle" }, { diff --git a/recipe_modules/git/example.expected/basic_branch.json b/recipe_modules/git/example.expected/basic_branch.json index 2083061b15..56fb11cdd0 100644 --- a/recipe_modules/git/example.expected/basic_branch.json +++ b/recipe_modules/git/example.expected/basic_branch.json @@ -5,7 +5,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[CWD]/src", + "[SLAVE_BUILD]/src", "--url", "https://chromium.googlesource.com/chromium/src.git" ], @@ -21,7 +21,7 @@ "testing", "--recurse-submodules" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git fetch" }, { @@ -31,7 +31,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git checkout" }, { @@ -40,7 +40,7 @@ "rev-parse", "HEAD" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -55,7 +55,7 @@ "-d", "-x" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git clean" }, { @@ -64,7 +64,7 @@ "submodule", "sync" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "submodule sync" }, { @@ -75,7 +75,7 @@ "--init", "--recursive" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "submodule update" }, { @@ -86,7 +86,7 @@ "count-objects", "-v" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "count-objects", "stdout": "/path/to/tmp/" }, @@ -97,7 +97,7 @@ "--get", "remote.origin.url" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git config remote.origin.url", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -112,7 +112,7 @@ "--format=%at", "-s" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git show", "stdout": "/path/to/tmp/" }, @@ -123,7 +123,7 @@ "origin", "--tags" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git fetch tags" }, { @@ -131,7 +131,7 @@ "git", "status" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git status" }, { @@ -139,7 +139,7 @@ "git", "status" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git status can_fail_build" }, { @@ -147,7 +147,7 @@ "git", "status" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git status cannot_fail_build" }, { @@ -156,7 +156,7 @@ "rebase", "origin/master" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "my repo rebase" }, { @@ -164,10 +164,10 @@ "git", "bundle", "create", - "[CWD]/all.bundle", + "[SLAVE_BUILD]/all.bundle", "--all" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git bundle" }, { diff --git a/recipe_modules/git/example.expected/basic_file_name.json b/recipe_modules/git/example.expected/basic_file_name.json index e5e5ea0c60..b5b08456cc 100644 --- a/recipe_modules/git/example.expected/basic_file_name.json +++ b/recipe_modules/git/example.expected/basic_file_name.json @@ -5,7 +5,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[CWD]/src", + "[SLAVE_BUILD]/src", "--url", "https://chromium.googlesource.com/chromium/src.git" ], @@ -21,7 +21,7 @@ "master", "--recurse-submodules" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git fetch" }, { @@ -33,7 +33,7 @@ "--", "DEPS" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git checkout" }, { @@ -42,7 +42,7 @@ "rev-parse", "HEAD" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -57,7 +57,7 @@ "-d", "-x" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git clean" }, { @@ -66,7 +66,7 @@ "submodule", "sync" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "submodule sync" }, { @@ -77,7 +77,7 @@ "--init", "--recursive" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "submodule update" }, { @@ -88,7 +88,7 @@ "count-objects", "-v" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "count-objects", "stdout": "/path/to/tmp/" }, @@ -99,7 +99,7 @@ "--get", "remote.origin.url" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git config remote.origin.url", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -114,7 +114,7 @@ "--format=%at", "-s" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git show", "stdout": "/path/to/tmp/" }, @@ -125,7 +125,7 @@ "origin", "--tags" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git fetch tags" }, { @@ -133,7 +133,7 @@ "git", "status" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git status" }, { @@ -141,7 +141,7 @@ "git", "status" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git status can_fail_build" }, { @@ -149,7 +149,7 @@ "git", "status" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git status cannot_fail_build" }, { @@ -158,7 +158,7 @@ "rebase", "origin/master" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "my repo rebase" }, { @@ -166,10 +166,10 @@ "git", "bundle", "create", - "[CWD]/all.bundle", + "[SLAVE_BUILD]/all.bundle", "--all" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git bundle" }, { diff --git a/recipe_modules/git/example.expected/basic_hash.json b/recipe_modules/git/example.expected/basic_hash.json index 9594acb7c6..fe9468f509 100644 --- a/recipe_modules/git/example.expected/basic_hash.json +++ b/recipe_modules/git/example.expected/basic_hash.json @@ -5,7 +5,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[CWD]/src", + "[SLAVE_BUILD]/src", "--url", "https://chromium.googlesource.com/chromium/src.git" ], @@ -20,7 +20,7 @@ "origin", "--recurse-submodules" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git fetch" }, { @@ -30,7 +30,7 @@ "-f", "abcdef0123456789abcdef0123456789abcdef01" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git checkout" }, { @@ -39,7 +39,7 @@ "rev-parse", "HEAD" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -54,7 +54,7 @@ "-d", "-x" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git clean" }, { @@ -63,7 +63,7 @@ "submodule", "sync" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "submodule sync" }, { @@ -74,7 +74,7 @@ "--init", "--recursive" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "submodule update" }, { @@ -85,7 +85,7 @@ "count-objects", "-v" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "count-objects", "stdout": "/path/to/tmp/" }, @@ -96,7 +96,7 @@ "--get", "remote.origin.url" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git config remote.origin.url", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -111,7 +111,7 @@ "--format=%at", "-s" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git show", "stdout": "/path/to/tmp/" }, @@ -122,7 +122,7 @@ "origin", "--tags" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git fetch tags" }, { @@ -130,7 +130,7 @@ "git", "status" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git status" }, { @@ -138,7 +138,7 @@ "git", "status" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git status can_fail_build" }, { @@ -146,7 +146,7 @@ "git", "status" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git status cannot_fail_build" }, { @@ -155,7 +155,7 @@ "rebase", "origin/master" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "my repo rebase" }, { @@ -163,10 +163,10 @@ "git", "bundle", "create", - "[CWD]/all.bundle", + "[SLAVE_BUILD]/all.bundle", "--all" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git bundle" }, { diff --git a/recipe_modules/git/example.expected/basic_ref.json b/recipe_modules/git/example.expected/basic_ref.json index 9bc917f94a..eb8aadfe08 100644 --- a/recipe_modules/git/example.expected/basic_ref.json +++ b/recipe_modules/git/example.expected/basic_ref.json @@ -5,7 +5,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[CWD]/src", + "[SLAVE_BUILD]/src", "--url", "https://chromium.googlesource.com/chromium/src.git" ], @@ -21,7 +21,7 @@ "refs/foo/bar", "--recurse-submodules" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git fetch" }, { @@ -31,7 +31,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git checkout" }, { @@ -40,7 +40,7 @@ "rev-parse", "HEAD" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -55,7 +55,7 @@ "-d", "-x" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git clean" }, { @@ -64,7 +64,7 @@ "submodule", "sync" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "submodule sync" }, { @@ -75,7 +75,7 @@ "--init", "--recursive" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "submodule update" }, { @@ -86,7 +86,7 @@ "count-objects", "-v" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "count-objects", "stdout": "/path/to/tmp/" }, @@ -97,7 +97,7 @@ "--get", "remote.origin.url" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git config remote.origin.url", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -112,7 +112,7 @@ "--format=%at", "-s" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git show", "stdout": "/path/to/tmp/" }, @@ -123,7 +123,7 @@ "origin", "--tags" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git fetch tags" }, { @@ -131,7 +131,7 @@ "git", "status" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git status" }, { @@ -139,7 +139,7 @@ "git", "status" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git status can_fail_build" }, { @@ -147,7 +147,7 @@ "git", "status" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git status cannot_fail_build" }, { @@ -156,7 +156,7 @@ "rebase", "origin/master" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "my repo rebase" }, { @@ -164,10 +164,10 @@ "git", "bundle", "create", - "[CWD]/all.bundle", + "[SLAVE_BUILD]/all.bundle", "--all" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git bundle" }, { diff --git a/recipe_modules/git/example.expected/basic_submodule_update_force.json b/recipe_modules/git/example.expected/basic_submodule_update_force.json index 02b2d83e35..f19168b55e 100644 --- a/recipe_modules/git/example.expected/basic_submodule_update_force.json +++ b/recipe_modules/git/example.expected/basic_submodule_update_force.json @@ -5,7 +5,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[CWD]/src", + "[SLAVE_BUILD]/src", "--url", "https://chromium.googlesource.com/chromium/src.git" ], @@ -21,7 +21,7 @@ "master", "--recurse-submodules" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git fetch" }, { @@ -31,7 +31,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git checkout" }, { @@ -40,7 +40,7 @@ "rev-parse", "HEAD" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -55,7 +55,7 @@ "-d", "-x" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git clean" }, { @@ -64,7 +64,7 @@ "submodule", "sync" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "submodule sync" }, { @@ -76,7 +76,7 @@ "--recursive", "--force" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "submodule update" }, { @@ -87,7 +87,7 @@ "count-objects", "-v" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "count-objects", "stdout": "/path/to/tmp/" }, @@ -98,7 +98,7 @@ "--get", "remote.origin.url" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git config remote.origin.url", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -113,7 +113,7 @@ "--format=%at", "-s" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git show", "stdout": "/path/to/tmp/" }, @@ -124,7 +124,7 @@ "origin", "--tags" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git fetch tags" }, { @@ -132,7 +132,7 @@ "git", "status" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git status" }, { @@ -140,7 +140,7 @@ "git", "status" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git status can_fail_build" }, { @@ -148,7 +148,7 @@ "git", "status" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git status cannot_fail_build" }, { @@ -157,7 +157,7 @@ "rebase", "origin/master" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "my repo rebase" }, { @@ -165,10 +165,10 @@ "git", "bundle", "create", - "[CWD]/all.bundle", + "[SLAVE_BUILD]/all.bundle", "--all" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git bundle" }, { diff --git a/recipe_modules/git/example.expected/can_fail_build.json b/recipe_modules/git/example.expected/can_fail_build.json index a5436ba14e..30d92d2dbc 100644 --- a/recipe_modules/git/example.expected/can_fail_build.json +++ b/recipe_modules/git/example.expected/can_fail_build.json @@ -5,7 +5,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[CWD]/src", + "[SLAVE_BUILD]/src", "--url", "https://chromium.googlesource.com/chromium/src.git" ], @@ -21,7 +21,7 @@ "master", "--recurse-submodules" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git fetch" }, { @@ -31,7 +31,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git checkout" }, { @@ -40,7 +40,7 @@ "rev-parse", "HEAD" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -55,7 +55,7 @@ "-d", "-x" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git clean" }, { @@ -64,7 +64,7 @@ "submodule", "sync" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "submodule sync" }, { @@ -75,7 +75,7 @@ "--init", "--recursive" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "submodule update" }, { @@ -86,7 +86,7 @@ "count-objects", "-v" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "count-objects", "stdout": "/path/to/tmp/" }, @@ -97,7 +97,7 @@ "--get", "remote.origin.url" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git config remote.origin.url", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -112,7 +112,7 @@ "--format=%at", "-s" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git show", "stdout": "/path/to/tmp/" }, @@ -123,7 +123,7 @@ "origin", "--tags" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git fetch tags" }, { @@ -131,7 +131,7 @@ "git", "status" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git status" }, { @@ -139,7 +139,7 @@ "git", "status" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git status can_fail_build", "~followup_annotations": [ "step returned non-zero exit code: 1", diff --git a/recipe_modules/git/example.expected/cannot_fail_build.json b/recipe_modules/git/example.expected/cannot_fail_build.json index 85f1486aea..4b65540d15 100644 --- a/recipe_modules/git/example.expected/cannot_fail_build.json +++ b/recipe_modules/git/example.expected/cannot_fail_build.json @@ -5,7 +5,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[CWD]/src", + "[SLAVE_BUILD]/src", "--url", "https://chromium.googlesource.com/chromium/src.git" ], @@ -21,7 +21,7 @@ "master", "--recurse-submodules" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git fetch" }, { @@ -31,7 +31,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git checkout" }, { @@ -40,7 +40,7 @@ "rev-parse", "HEAD" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -55,7 +55,7 @@ "-d", "-x" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git clean" }, { @@ -64,7 +64,7 @@ "submodule", "sync" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "submodule sync" }, { @@ -75,7 +75,7 @@ "--init", "--recursive" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "submodule update" }, { @@ -86,7 +86,7 @@ "count-objects", "-v" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "count-objects", "stdout": "/path/to/tmp/" }, @@ -97,7 +97,7 @@ "--get", "remote.origin.url" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git config remote.origin.url", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -112,7 +112,7 @@ "--format=%at", "-s" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git show", "stdout": "/path/to/tmp/" }, @@ -123,7 +123,7 @@ "origin", "--tags" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git fetch tags" }, { @@ -131,7 +131,7 @@ "git", "status" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git status" }, { @@ -139,7 +139,7 @@ "git", "status" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git status can_fail_build" }, { @@ -147,7 +147,7 @@ "git", "status" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git status cannot_fail_build", "~followup_annotations": [ "step returned non-zero exit code: 1", @@ -160,7 +160,7 @@ "rebase", "origin/master" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "my repo rebase" }, { @@ -168,10 +168,10 @@ "git", "bundle", "create", - "[CWD]/all.bundle", + "[SLAVE_BUILD]/all.bundle", "--all" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git bundle" }, { diff --git a/recipe_modules/git/example.expected/cat-file_test.json b/recipe_modules/git/example.expected/cat-file_test.json index c9d5d11ec8..513457abbe 100644 --- a/recipe_modules/git/example.expected/cat-file_test.json +++ b/recipe_modules/git/example.expected/cat-file_test.json @@ -5,7 +5,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[CWD]/src", + "[SLAVE_BUILD]/src", "--url", "https://chromium.googlesource.com/chromium/src.git" ], @@ -21,7 +21,7 @@ "abcdef12345", "--recurse-submodules" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git fetch" }, { @@ -31,7 +31,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git checkout" }, { @@ -40,7 +40,7 @@ "rev-parse", "HEAD" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -55,7 +55,7 @@ "-d", "-x" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git clean" }, { @@ -64,7 +64,7 @@ "submodule", "sync" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "submodule sync" }, { @@ -75,7 +75,7 @@ "--init", "--recursive" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "submodule update" }, { @@ -86,7 +86,7 @@ "count-objects", "-v" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "count-objects", "stdout": "/path/to/tmp/" }, @@ -97,7 +97,7 @@ "--get", "remote.origin.url" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git config remote.origin.url", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -112,7 +112,7 @@ "--format=%at", "-s" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git show", "stdout": "/path/to/tmp/" }, @@ -123,7 +123,7 @@ "origin", "--tags" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git fetch tags" }, { @@ -131,7 +131,7 @@ "git", "status" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git status" }, { @@ -139,7 +139,7 @@ "git", "status" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git status can_fail_build" }, { @@ -147,7 +147,7 @@ "git", "status" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git status cannot_fail_build" }, { @@ -156,7 +156,7 @@ "rebase", "origin/master" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "my repo rebase" }, { @@ -166,7 +166,7 @@ "origin", "--tags" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git fetch tags (2)", "stdout": "/path/to/tmp/" }, @@ -177,7 +177,7 @@ "blob", "abcdef12345:TestFile" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git cat-file abcdef12345:TestFile", "stdout": "/path/to/tmp/" }, @@ -186,10 +186,10 @@ "git", "bundle", "create", - "[CWD]/all.bundle", + "[SLAVE_BUILD]/all.bundle", "--all" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git bundle" }, { diff --git a/recipe_modules/git/example.expected/count-objects_delta.json b/recipe_modules/git/example.expected/count-objects_delta.json index 760c2c805c..b2ca9cb4cc 100644 --- a/recipe_modules/git/example.expected/count-objects_delta.json +++ b/recipe_modules/git/example.expected/count-objects_delta.json @@ -5,7 +5,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[CWD]/src", + "[SLAVE_BUILD]/src", "--url", "https://chromium.googlesource.com/chromium/src.git" ], @@ -18,7 +18,7 @@ "count-objects", "-v" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "count-objects before git fetch", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -42,7 +42,7 @@ "master", "--recurse-submodules" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git fetch" }, { @@ -51,7 +51,7 @@ "count-objects", "-v" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "count-objects after git fetch", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -104,7 +104,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git checkout" }, { @@ -113,7 +113,7 @@ "rev-parse", "HEAD" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -128,7 +128,7 @@ "-d", "-x" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git clean" }, { @@ -137,7 +137,7 @@ "submodule", "sync" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "submodule sync" }, { @@ -148,7 +148,7 @@ "--init", "--recursive" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "submodule update" }, { @@ -159,7 +159,7 @@ "count-objects", "-v" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "count-objects", "stdout": "/path/to/tmp/" }, @@ -170,7 +170,7 @@ "--get", "remote.origin.url" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git config remote.origin.url", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -185,7 +185,7 @@ "--format=%at", "-s" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git show", "stdout": "/path/to/tmp/" }, @@ -196,7 +196,7 @@ "origin", "--tags" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git fetch tags" }, { @@ -204,7 +204,7 @@ "git", "status" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git status" }, { @@ -212,7 +212,7 @@ "git", "status" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git status can_fail_build" }, { @@ -220,7 +220,7 @@ "git", "status" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git status cannot_fail_build" }, { @@ -229,7 +229,7 @@ "rebase", "origin/master" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "my repo rebase" }, { @@ -237,10 +237,10 @@ "git", "bundle", "create", - "[CWD]/all.bundle", + "[SLAVE_BUILD]/all.bundle", "--all" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git bundle" }, { diff --git a/recipe_modules/git/example.expected/count-objects_failed.json b/recipe_modules/git/example.expected/count-objects_failed.json index f7574fcace..2087e3de57 100644 --- a/recipe_modules/git/example.expected/count-objects_failed.json +++ b/recipe_modules/git/example.expected/count-objects_failed.json @@ -5,7 +5,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[CWD]/src", + "[SLAVE_BUILD]/src", "--url", "https://chromium.googlesource.com/chromium/src.git" ], @@ -21,7 +21,7 @@ "master", "--recurse-submodules" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git fetch" }, { @@ -31,7 +31,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git checkout" }, { @@ -40,7 +40,7 @@ "rev-parse", "HEAD" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -55,7 +55,7 @@ "-d", "-x" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git clean" }, { @@ -64,7 +64,7 @@ "submodule", "sync" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "submodule sync" }, { @@ -75,7 +75,7 @@ "--init", "--recursive" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "submodule update" }, { @@ -86,7 +86,7 @@ "count-objects", "-v" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "count-objects", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -101,7 +101,7 @@ "--get", "remote.origin.url" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git config remote.origin.url", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -116,7 +116,7 @@ "--format=%at", "-s" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git show", "stdout": "/path/to/tmp/" }, @@ -127,7 +127,7 @@ "origin", "--tags" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git fetch tags" }, { @@ -135,7 +135,7 @@ "git", "status" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git status" }, { @@ -143,7 +143,7 @@ "git", "status" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git status can_fail_build" }, { @@ -151,7 +151,7 @@ "git", "status" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git status cannot_fail_build" }, { @@ -160,7 +160,7 @@ "rebase", "origin/master" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "my repo rebase" }, { @@ -168,10 +168,10 @@ "git", "bundle", "create", - "[CWD]/all.bundle", + "[SLAVE_BUILD]/all.bundle", "--all" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git bundle" }, { diff --git a/recipe_modules/git/example.expected/count-objects_with_bad_output.json b/recipe_modules/git/example.expected/count-objects_with_bad_output.json index 0e6fc638a5..26cc6c13d2 100644 --- a/recipe_modules/git/example.expected/count-objects_with_bad_output.json +++ b/recipe_modules/git/example.expected/count-objects_with_bad_output.json @@ -5,7 +5,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[CWD]/src", + "[SLAVE_BUILD]/src", "--url", "https://chromium.googlesource.com/chromium/src.git" ], @@ -21,7 +21,7 @@ "master", "--recurse-submodules" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git fetch" }, { @@ -31,7 +31,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git checkout" }, { @@ -40,7 +40,7 @@ "rev-parse", "HEAD" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -55,7 +55,7 @@ "-d", "-x" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git clean" }, { @@ -64,7 +64,7 @@ "submodule", "sync" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "submodule sync" }, { @@ -75,7 +75,7 @@ "--init", "--recursive" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "submodule update" }, { @@ -86,7 +86,7 @@ "count-objects", "-v" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "count-objects", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -102,7 +102,7 @@ "--get", "remote.origin.url" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git config remote.origin.url", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -117,7 +117,7 @@ "--format=%at", "-s" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git show", "stdout": "/path/to/tmp/" }, @@ -128,7 +128,7 @@ "origin", "--tags" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git fetch tags" }, { @@ -136,7 +136,7 @@ "git", "status" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git status" }, { @@ -144,7 +144,7 @@ "git", "status" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git status can_fail_build" }, { @@ -152,7 +152,7 @@ "git", "status" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git status cannot_fail_build" }, { @@ -161,7 +161,7 @@ "rebase", "origin/master" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "my repo rebase" }, { @@ -169,10 +169,10 @@ "git", "bundle", "create", - "[CWD]/all.bundle", + "[SLAVE_BUILD]/all.bundle", "--all" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git bundle" }, { diff --git a/recipe_modules/git/example.expected/count-objects_with_bad_output_fails_build.json b/recipe_modules/git/example.expected/count-objects_with_bad_output_fails_build.json index 53b47e0c93..d044d15e5f 100644 --- a/recipe_modules/git/example.expected/count-objects_with_bad_output_fails_build.json +++ b/recipe_modules/git/example.expected/count-objects_with_bad_output_fails_build.json @@ -5,7 +5,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[CWD]/src", + "[SLAVE_BUILD]/src", "--url", "https://chromium.googlesource.com/chromium/src.git" ], @@ -21,7 +21,7 @@ "master", "--recurse-submodules" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git fetch" }, { @@ -31,7 +31,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git checkout" }, { @@ -40,7 +40,7 @@ "rev-parse", "HEAD" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -55,7 +55,7 @@ "-d", "-x" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git clean" }, { @@ -64,7 +64,7 @@ "submodule", "sync" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "submodule sync" }, { @@ -75,7 +75,7 @@ "--init", "--recursive" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "submodule update" }, { @@ -86,7 +86,7 @@ "count-objects", "-v" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "count-objects", "stdout": "/path/to/tmp/", "~followup_annotations": [ diff --git a/recipe_modules/git/example.expected/curl_trace_file.json b/recipe_modules/git/example.expected/curl_trace_file.json index cf6c6a4c10..a0b28fa353 100644 --- a/recipe_modules/git/example.expected/curl_trace_file.json +++ b/recipe_modules/git/example.expected/curl_trace_file.json @@ -5,7 +5,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[CWD]/src", + "[SLAVE_BUILD]/src", "--url", "https://chromium.googlesource.com/chromium/src.git" ], @@ -21,12 +21,12 @@ "refs/foo/bar", "--recurse-submodules" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "env": { "GIT_CURL_VERBOSE": "1" }, "name": "git fetch", - "stderr": "[CWD]/curl_trace.log" + "stderr": "[SLAVE_BUILD]/curl_trace.log" }, { "cmd": [ @@ -35,7 +35,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git checkout" }, { @@ -44,7 +44,7 @@ "rev-parse", "HEAD" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -59,7 +59,7 @@ "-d", "-x" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git clean" }, { @@ -68,7 +68,7 @@ "submodule", "sync" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "submodule sync" }, { @@ -79,7 +79,7 @@ "--init", "--recursive" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "submodule update" }, { @@ -90,7 +90,7 @@ "count-objects", "-v" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "count-objects", "stdout": "/path/to/tmp/" }, @@ -101,7 +101,7 @@ "--get", "remote.origin.url" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git config remote.origin.url", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -116,7 +116,7 @@ "--format=%at", "-s" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git show", "stdout": "/path/to/tmp/" }, @@ -127,7 +127,7 @@ "origin", "--tags" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git fetch tags" }, { @@ -135,7 +135,7 @@ "git", "status" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git status" }, { @@ -143,7 +143,7 @@ "git", "status" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git status can_fail_build" }, { @@ -151,7 +151,7 @@ "git", "status" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git status cannot_fail_build" }, { @@ -160,7 +160,7 @@ "rebase", "origin/master" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "my repo rebase" }, { @@ -168,10 +168,10 @@ "git", "bundle", "create", - "[CWD]/all.bundle", + "[SLAVE_BUILD]/all.bundle", "--all" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git bundle" }, { diff --git a/recipe_modules/git/example.expected/platform_win.json b/recipe_modules/git/example.expected/platform_win.json index 68fa4205c3..f71d6390e0 100644 --- a/recipe_modules/git/example.expected/platform_win.json +++ b/recipe_modules/git/example.expected/platform_win.json @@ -12,7 +12,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py", "--path", - "[CWD]\\src", + "[SLAVE_BUILD]\\src", "--url", "https://chromium.googlesource.com/chromium/src.git", "--git_cmd_path", @@ -30,7 +30,7 @@ "master", "--recurse-submodules" ], - "cwd": "[CWD]\\src", + "cwd": "[SLAVE_BUILD]\\src", "name": "git fetch" }, { @@ -40,7 +40,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[CWD]\\src", + "cwd": "[SLAVE_BUILD]\\src", "name": "git checkout" }, { @@ -49,7 +49,7 @@ "rev-parse", "HEAD" ], - "cwd": "[CWD]\\src", + "cwd": "[SLAVE_BUILD]\\src", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -64,7 +64,7 @@ "-d", "-x" ], - "cwd": "[CWD]\\src", + "cwd": "[SLAVE_BUILD]\\src", "name": "git clean" }, { @@ -73,7 +73,7 @@ "submodule", "sync" ], - "cwd": "[CWD]\\src", + "cwd": "[SLAVE_BUILD]\\src", "name": "submodule sync" }, { @@ -84,7 +84,7 @@ "--init", "--recursive" ], - "cwd": "[CWD]\\src", + "cwd": "[SLAVE_BUILD]\\src", "name": "submodule update" }, { @@ -95,7 +95,7 @@ "count-objects", "-v" ], - "cwd": "[CWD]\\src", + "cwd": "[SLAVE_BUILD]\\src", "name": "count-objects", "stdout": "/path/to/tmp/" }, @@ -106,7 +106,7 @@ "--get", "remote.origin.url" ], - "cwd": "[CWD]\\src", + "cwd": "[SLAVE_BUILD]\\src", "name": "git config remote.origin.url", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -121,7 +121,7 @@ "--format=%at", "-s" ], - "cwd": "[CWD]\\src", + "cwd": "[SLAVE_BUILD]\\src", "name": "git show", "stdout": "/path/to/tmp/" }, @@ -132,7 +132,7 @@ "origin", "--tags" ], - "cwd": "[CWD]\\src", + "cwd": "[SLAVE_BUILD]\\src", "name": "git fetch tags" }, { @@ -140,7 +140,7 @@ "RECIPE_PACKAGE_REPO[depot_tools]\\git.bat", "status" ], - "cwd": "[CWD]\\src", + "cwd": "[SLAVE_BUILD]\\src", "name": "git status" }, { @@ -148,7 +148,7 @@ "RECIPE_PACKAGE_REPO[depot_tools]\\git.bat", "status" ], - "cwd": "[CWD]\\src", + "cwd": "[SLAVE_BUILD]\\src", "name": "git status can_fail_build" }, { @@ -156,7 +156,7 @@ "RECIPE_PACKAGE_REPO[depot_tools]\\git.bat", "status" ], - "cwd": "[CWD]\\src", + "cwd": "[SLAVE_BUILD]\\src", "name": "git status cannot_fail_build" }, { @@ -165,7 +165,7 @@ "rebase", "origin/master" ], - "cwd": "[CWD]\\src", + "cwd": "[SLAVE_BUILD]\\src", "name": "my repo rebase" }, { @@ -173,10 +173,10 @@ "RECIPE_PACKAGE_REPO[depot_tools]\\git.bat", "bundle", "create", - "[CWD]\\all.bundle", + "[SLAVE_BUILD]\\all.bundle", "--all" ], - "cwd": "[CWD]\\src", + "cwd": "[SLAVE_BUILD]\\src", "name": "git bundle" }, { diff --git a/recipe_modules/git/example.expected/rebase_failed.json b/recipe_modules/git/example.expected/rebase_failed.json index 38111714a9..39666c74dd 100644 --- a/recipe_modules/git/example.expected/rebase_failed.json +++ b/recipe_modules/git/example.expected/rebase_failed.json @@ -5,7 +5,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[CWD]/src", + "[SLAVE_BUILD]/src", "--url", "https://chromium.googlesource.com/chromium/src.git" ], @@ -21,7 +21,7 @@ "master", "--recurse-submodules" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git fetch" }, { @@ -31,7 +31,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git checkout" }, { @@ -40,7 +40,7 @@ "rev-parse", "HEAD" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -55,7 +55,7 @@ "-d", "-x" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git clean" }, { @@ -64,7 +64,7 @@ "submodule", "sync" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "submodule sync" }, { @@ -75,7 +75,7 @@ "--init", "--recursive" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "submodule update" }, { @@ -86,7 +86,7 @@ "count-objects", "-v" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "count-objects", "stdout": "/path/to/tmp/" }, @@ -97,7 +97,7 @@ "--get", "remote.origin.url" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git config remote.origin.url", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -112,7 +112,7 @@ "--format=%at", "-s" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git show", "stdout": "/path/to/tmp/" }, @@ -123,7 +123,7 @@ "origin", "--tags" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git fetch tags" }, { @@ -131,7 +131,7 @@ "git", "status" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git status" }, { @@ -139,7 +139,7 @@ "git", "status" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git status can_fail_build" }, { @@ -147,7 +147,7 @@ "git", "status" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git status cannot_fail_build" }, { @@ -156,7 +156,7 @@ "rebase", "origin/master" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "my repo rebase", "~followup_annotations": [ "step returned non-zero exit code: 1", @@ -169,7 +169,7 @@ "rebase", "--abort" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "my repo rebase abort" }, { diff --git a/recipe_modules/git/example.expected/remote_not_origin.json b/recipe_modules/git/example.expected/remote_not_origin.json index 407acd60e2..f1b6f2eb60 100644 --- a/recipe_modules/git/example.expected/remote_not_origin.json +++ b/recipe_modules/git/example.expected/remote_not_origin.json @@ -5,7 +5,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[CWD]/src", + "[SLAVE_BUILD]/src", "--url", "https://chromium.googlesource.com/chromium/src.git", "--remote", @@ -23,7 +23,7 @@ "master", "--recurse-submodules" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git fetch" }, { @@ -33,7 +33,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git checkout" }, { @@ -42,7 +42,7 @@ "rev-parse", "HEAD" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -57,7 +57,7 @@ "-d", "-x" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git clean" }, { @@ -66,7 +66,7 @@ "submodule", "sync" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "submodule sync" }, { @@ -77,7 +77,7 @@ "--init", "--recursive" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "submodule update" }, { @@ -88,7 +88,7 @@ "count-objects", "-v" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "count-objects", "stdout": "/path/to/tmp/" }, @@ -99,7 +99,7 @@ "--get", "remote.origin.url" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git config remote.origin.url", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -114,7 +114,7 @@ "--format=%at", "-s" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git show", "stdout": "/path/to/tmp/" }, @@ -125,7 +125,7 @@ "not_origin", "--tags" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git fetch tags" }, { @@ -133,7 +133,7 @@ "git", "status" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git status" }, { @@ -141,7 +141,7 @@ "git", "status" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git status can_fail_build" }, { @@ -149,7 +149,7 @@ "git", "status" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git status cannot_fail_build" }, { @@ -158,7 +158,7 @@ "rebase", "not_origin/master" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "my repo rebase" }, { @@ -166,10 +166,10 @@ "git", "bundle", "create", - "[CWD]/all.bundle", + "[SLAVE_BUILD]/all.bundle", "--all" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git bundle" }, { diff --git a/recipe_modules/git/example.expected/set_got_revision.json b/recipe_modules/git/example.expected/set_got_revision.json index e00cdca1dd..f0eb36a3e3 100644 --- a/recipe_modules/git/example.expected/set_got_revision.json +++ b/recipe_modules/git/example.expected/set_got_revision.json @@ -5,7 +5,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[CWD]/src", + "[SLAVE_BUILD]/src", "--url", "https://chromium.googlesource.com/chromium/src.git" ], @@ -21,7 +21,7 @@ "master", "--recurse-submodules" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git fetch" }, { @@ -31,7 +31,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git checkout" }, { @@ -40,7 +40,7 @@ "rev-parse", "HEAD" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -56,7 +56,7 @@ "-d", "-x" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git clean" }, { @@ -65,7 +65,7 @@ "submodule", "sync" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "submodule sync" }, { @@ -76,7 +76,7 @@ "--init", "--recursive" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "submodule update" }, { @@ -87,7 +87,7 @@ "count-objects", "-v" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "count-objects", "stdout": "/path/to/tmp/" }, @@ -98,7 +98,7 @@ "--get", "remote.origin.url" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git config remote.origin.url", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -113,7 +113,7 @@ "--format=%at", "-s" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git show", "stdout": "/path/to/tmp/" }, @@ -124,7 +124,7 @@ "origin", "--tags" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git fetch tags" }, { @@ -132,7 +132,7 @@ "git", "status" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git status" }, { @@ -140,7 +140,7 @@ "git", "status" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git status can_fail_build" }, { @@ -148,7 +148,7 @@ "git", "status" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git status cannot_fail_build" }, { @@ -157,7 +157,7 @@ "rebase", "origin/master" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "my repo rebase" }, { @@ -165,10 +165,10 @@ "git", "bundle", "create", - "[CWD]/all.bundle", + "[SLAVE_BUILD]/all.bundle", "--all" ], - "cwd": "[CWD]/src", + "cwd": "[SLAVE_BUILD]/src", "name": "git bundle" }, { diff --git a/recipe_modules/git/example.py b/recipe_modules/git/example.py index 02836b45c4..066785a2a3 100644 --- a/recipe_modules/git/example.py +++ b/recipe_modules/git/example.py @@ -4,7 +4,6 @@ DEPS = [ 'git', - 'infra_paths', 'recipe_engine/path', 'recipe_engine/platform', 'recipe_engine/properties', @@ -20,7 +19,7 @@ def RunSteps(api): # useful for debugging git access issues that are reproducible only on bots. curl_trace_file = None if api.properties.get('use_curl_trace'): - curl_trace_file = api.infra_paths['slave_build'].join('curl_trace.log') + curl_trace_file = api.path['slave_build'].join('curl_trace.log') submodule_update_force = api.properties.get('submodule_update_force', False) submodule_update_recursive = api.properties.get('submodule_update_recursive', @@ -81,7 +80,7 @@ def RunSteps(api): # Bundle the repository. api.git.bundle_create( - api.infra_paths['slave_build'].join('all.bundle')) + api.path['slave_build'].join('all.bundle')) def GenTests(api): diff --git a/recipe_modules/infra_paths/__init__.py b/recipe_modules/infra_paths/__init__.py deleted file mode 100644 index 88b9d272fc..0000000000 --- a/recipe_modules/infra_paths/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -DEPS = [ - 'recipe_engine/path', - 'recipe_engine/platform', - 'recipe_engine/properties', -] diff --git a/recipe_modules/infra_paths/api.py b/recipe_modules/infra_paths/api.py deleted file mode 100644 index c84928c4fa..0000000000 --- a/recipe_modules/infra_paths/api.py +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 2016 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -from recipe_engine import recipe_api - - -class InfraPathsApi(recipe_api.RecipeApi): - def get_config_defaults(self): - return { - 'PLATFORM': self.m.platform.name, - 'CURRENT_WORKING_DIR': self.m.path['cwd'], - 'ROOT': self.m.path['root'], - } - - def __init__(self, **kwargs): - super(InfraPathsApi, self).__init__(**kwargs) - self._config_set = False - - def _lazy_set_config(self): - if self._config_set: - return - self._config_set = True - - path_config = self.m.properties.get('path_config') - if path_config in ('kitchen',): - self.set_config(path_config) - else: - self.set_config('buildbot') - - def __getitem__(self, name): - self._lazy_set_config() - return self.c.paths[name] diff --git a/recipe_modules/infra_paths/config.py b/recipe_modules/infra_paths/config.py deleted file mode 100644 index e252912f29..0000000000 --- a/recipe_modules/infra_paths/config.py +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 2016 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -from recipe_engine.config import config_item_context, ConfigGroup, Dict, Static -from recipe_engine.config_types import Path - -def BaseConfig(PLATFORM, CURRENT_WORKING_DIR, ROOT, **_kwargs): - return ConfigGroup( - paths = Dict(value_type=Path), - - PLATFORM = Static(PLATFORM), - CURRENT_WORKING_DIR = Static(CURRENT_WORKING_DIR), - ROOT = Static(ROOT), - ) - -config_ctx = config_item_context(BaseConfig) - -@config_ctx() -def buildbot(c): - c.paths['root'] = c.ROOT.join('b') - c.paths['slave_build'] = c.CURRENT_WORKING_DIR - c.paths['cache'] = c.paths['root'].join( - 'build', 'slave', 'cache') - c.paths['git_cache'] = c.paths['root'].join( - 'build', 'slave', 'cache_dir') - c.paths['goma_cache'] = c.paths['root'].join( - 'build', 'slave', 'goma_cache') - for token in ('build_internal', 'build', 'depot_tools'): - c.paths[token] = c.paths['root'].join(token,) - -@config_ctx() -def kitchen(c): - c.paths['root'] = c.CURRENT_WORKING_DIR - c.paths['slave_build'] = c.CURRENT_WORKING_DIR - # TODO(phajdan.jr): have one cache dir, let clients append suffixes. - # TODO(phajdan.jr): set persistent cache path for remaining platforms. - # NOTE: do not use /b/swarm_slave here - it gets deleted on bot redeploy, - # and may happen even after a reboot. - if c.PLATFORM == 'linux': - c.paths['cache'] = c.ROOT.join( - 'b', 'cache', 'chromium') - c.paths['git_cache'] = c.ROOT.join( - 'b', 'cache', 'chromium', 'git_cache') - c.paths['goma_cache'] = c.ROOT.join( - 'b', 'cache', 'chromium', 'goma_cache') - else: - c.paths['cache'] = c.paths['root'].join('cache') - c.paths['git_cache'] = c.paths['root'].join('cache_dir') - c.paths['goma_cache'] = c.paths['root'].join('goma_cache') diff --git a/recipe_modules/infra_paths/example.expected/linux.json b/recipe_modules/infra_paths/example.expected/linux.json deleted file mode 100644 index 9ec0cb6ce5..0000000000 --- a/recipe_modules/infra_paths/example.expected/linux.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "cmd": [], - "cwd": "[CWD]", - "name": "step" - }, - { - "name": "$result", - "recipe_result": null, - "status_code": 0 - } -] \ No newline at end of file diff --git a/recipe_modules/infra_paths/example.expected/linux_kitchen.json b/recipe_modules/infra_paths/example.expected/linux_kitchen.json deleted file mode 100644 index 9ec0cb6ce5..0000000000 --- a/recipe_modules/infra_paths/example.expected/linux_kitchen.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "cmd": [], - "cwd": "[CWD]", - "name": "step" - }, - { - "name": "$result", - "recipe_result": null, - "status_code": 0 - } -] \ No newline at end of file diff --git a/recipe_modules/infra_paths/example.expected/mac.json b/recipe_modules/infra_paths/example.expected/mac.json deleted file mode 100644 index 9ec0cb6ce5..0000000000 --- a/recipe_modules/infra_paths/example.expected/mac.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "cmd": [], - "cwd": "[CWD]", - "name": "step" - }, - { - "name": "$result", - "recipe_result": null, - "status_code": 0 - } -] \ No newline at end of file diff --git a/recipe_modules/infra_paths/example.expected/mac_kitchen.json b/recipe_modules/infra_paths/example.expected/mac_kitchen.json deleted file mode 100644 index 9ec0cb6ce5..0000000000 --- a/recipe_modules/infra_paths/example.expected/mac_kitchen.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "cmd": [], - "cwd": "[CWD]", - "name": "step" - }, - { - "name": "$result", - "recipe_result": null, - "status_code": 0 - } -] \ No newline at end of file diff --git a/recipe_modules/infra_paths/example.expected/win.json b/recipe_modules/infra_paths/example.expected/win.json deleted file mode 100644 index 9ec0cb6ce5..0000000000 --- a/recipe_modules/infra_paths/example.expected/win.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "cmd": [], - "cwd": "[CWD]", - "name": "step" - }, - { - "name": "$result", - "recipe_result": null, - "status_code": 0 - } -] \ No newline at end of file diff --git a/recipe_modules/infra_paths/example.expected/win_kitchen.json b/recipe_modules/infra_paths/example.expected/win_kitchen.json deleted file mode 100644 index 9ec0cb6ce5..0000000000 --- a/recipe_modules/infra_paths/example.expected/win_kitchen.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "cmd": [], - "cwd": "[CWD]", - "name": "step" - }, - { - "name": "$result", - "recipe_result": null, - "status_code": 0 - } -] \ No newline at end of file diff --git a/recipe_modules/infra_paths/example.py b/recipe_modules/infra_paths/example.py deleted file mode 100644 index 9e6f712faa..0000000000 --- a/recipe_modules/infra_paths/example.py +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 2016 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -DEPS = [ - 'infra_paths', - 'recipe_engine/platform', - 'recipe_engine/properties', - 'recipe_engine/step', -] - -from recipe_engine.config_types import Path - -def RunSteps(api): - api.step('step', [], cwd=api.infra_paths['slave_build']) - - -def GenTests(api): - for platform in ('linux', 'win', 'mac'): - yield (api.test(platform) + api.platform.name(platform)) - - yield (api.test('%s_kitchen' % platform) + - api.platform.name(platform) + - api.properties(path_config='kitchen')) diff --git a/recipe_modules/rietveld/__init__.py b/recipe_modules/rietveld/__init__.py index ea30e78eea..fdc9352653 100644 --- a/recipe_modules/rietveld/__init__.py +++ b/recipe_modules/rietveld/__init__.py @@ -1,5 +1,4 @@ DEPS = [ - 'infra_paths', 'recipe_engine/path', 'recipe_engine/properties', 'recipe_engine/python', diff --git a/recipe_modules/rietveld/api.py b/recipe_modules/rietveld/api.py index 4011a68bdf..b52ec0bc96 100644 --- a/recipe_modules/rietveld/api.py +++ b/recipe_modules/rietveld/api.py @@ -67,22 +67,22 @@ class RietveldApi(recipe_api.RecipeApi): if authentication == 'oauth2': step_result = self.m.python( 'apply_issue', - self.m.infra_paths['depot_tools'].join('apply_issue.py'), [ + self.m.path['depot_tools'].join('apply_issue.py'), [ '-r', self.m.path['checkout'].join(*root_pieces), '-i', issue_number, '-p', self.m.properties['patchset'], '-s', rietveld_url, - '-E', self.m.infra_paths['build'].join( - 'site_config', '.rietveld_client_email'), - '-k', self.m.infra_paths['build'].join( - 'site_config', '.rietveld_secret_key') + '-E', self.m.path['build'].join('site_config', + '.rietveld_client_email'), + '-k', self.m.path['build'].join('site_config', + '.rietveld_secret_key') ], ) else: step_result = self.m.python( 'apply_issue', - self.m.infra_paths['depot_tools'].join('apply_issue.py'), [ + self.m.path['depot_tools'].join('apply_issue.py'), [ '-r', self.m.path['checkout'].join(*root_pieces), '-i', issue_number, '-p', self.m.properties['patchset'], diff --git a/recipe_modules/rietveld/example.expected/basic.json b/recipe_modules/rietveld/example.expected/basic.json index 5771edd2f5..c88cba8169 100644 --- a/recipe_modules/rietveld/example.expected/basic.json +++ b/recipe_modules/rietveld/example.expected/basic.json @@ -3,9 +3,9 @@ "cmd": [ "python", "-u", - "[ROOT]/b/depot_tools/apply_issue.py", + "[DEPOT_TOOLS]/apply_issue.py", "-r", - "[CWD]/foo/bar", + "[SLAVE_BUILD]/foo/bar", "-i", "1", "-p", @@ -13,9 +13,9 @@ "-s", "http://review_tool.url", "-E", - "[ROOT]/b/build/site_config/.rietveld_client_email", + "[BUILD]/site_config/.rietveld_client_email", "-k", - "[ROOT]/b/build/site_config/.rietveld_secret_key" + "[BUILD]/site_config/.rietveld_secret_key" ], "cwd": "[SLAVE_BUILD]", "name": "apply_issue", diff --git a/recipe_modules/rietveld/example.py b/recipe_modules/rietveld/example.py index b389687c56..b00cb201a3 100644 --- a/recipe_modules/rietveld/example.py +++ b/recipe_modules/rietveld/example.py @@ -3,7 +3,6 @@ # found in the LICENSE file. DEPS = [ - 'infra_paths', 'recipe_engine/path', 'recipe_engine/properties', 'recipe_engine/step', @@ -11,7 +10,7 @@ DEPS = [ ] def RunSteps(api): - api.path['checkout'] = api.infra_paths['slave_build'] + api.path['checkout'] = api.path['slave_build'] api.rietveld.apply_issue('foo', 'bar', authentication='oauth2') api.rietveld.calculate_issue_root({'project': ['']}) diff --git a/recipe_modules/tryserver/__init__.py b/recipe_modules/tryserver/__init__.py index ac07362e80..53957cdc2e 100644 --- a/recipe_modules/tryserver/__init__.py +++ b/recipe_modules/tryserver/__init__.py @@ -4,7 +4,6 @@ DEPS = [ 'git', - 'infra_paths', 'recipe_engine/json', 'recipe_engine/path', 'recipe_engine/platform', diff --git a/recipe_modules/tryserver/api.py b/recipe_modules/tryserver/api.py index 18bf904267..8bd8df87f9 100644 --- a/recipe_modules/tryserver/api.py +++ b/recipe_modules/tryserver/api.py @@ -100,8 +100,7 @@ class TryserverApi(recipe_api.RecipeApi): patch_ref = self.m.properties['patch_ref'] patch_dir = self.m.path.mkdtemp('patch') - git_setup_py = self.m.infra_paths['build'].join( - 'scripts', 'slave', 'git_setup.py') + git_setup_py = self.m.path['build'].join('scripts', 'slave', 'git_setup.py') git_setup_args = ['--path', patch_dir, '--url', patch_repo_url] patch_path = patch_dir.join('patch.diff') diff --git a/recipe_modules/tryserver/example.expected/with_git_patch.json b/recipe_modules/tryserver/example.expected/with_git_patch.json index 2c28083b71..117f1c2e17 100644 --- a/recipe_modules/tryserver/example.expected/with_git_patch.json +++ b/recipe_modules/tryserver/example.expected/with_git_patch.json @@ -3,7 +3,7 @@ "cmd": [ "python", "-u", - "[ROOT]/b/build/scripts/slave/git_setup.py", + "[BUILD]/scripts/slave/git_setup.py", "--path", "[TMP_BASE]/patch_tmp_1", "--url", @@ -47,7 +47,7 @@ "cmd": [ "patch", "--dir", - "[CWD]", + "[SLAVE_BUILD]", "--force", "--forward", "--remove-empty-files", @@ -75,7 +75,7 @@ "--cached", "--name-only" ], - "cwd": "[CWD]/v8", + "cwd": "[SLAVE_BUILD]/v8", "name": "git diff to analyze patch", "stdout": "/path/to/tmp/", "~followup_annotations": [ diff --git a/recipe_modules/tryserver/example.expected/with_rietveld_patch.json b/recipe_modules/tryserver/example.expected/with_rietveld_patch.json index aeff690c5b..8565941e2b 100644 --- a/recipe_modules/tryserver/example.expected/with_rietveld_patch.json +++ b/recipe_modules/tryserver/example.expected/with_rietveld_patch.json @@ -3,9 +3,9 @@ "cmd": [ "python", "-u", - "[ROOT]/b/depot_tools/apply_issue.py", + "[DEPOT_TOOLS]/apply_issue.py", "-r", - "[CWD]", + "[SLAVE_BUILD]", "-i", "12853011", "-p", @@ -27,7 +27,7 @@ "--cached", "--name-only" ], - "cwd": "[CWD]", + "cwd": "[SLAVE_BUILD]", "name": "git diff to analyze patch", "stdout": "/path/to/tmp/", "~followup_annotations": [ diff --git a/recipe_modules/tryserver/example.expected/with_svn_patch.json b/recipe_modules/tryserver/example.expected/with_svn_patch.json index 60f83bc882..1046c03395 100644 --- a/recipe_modules/tryserver/example.expected/with_svn_patch.json +++ b/recipe_modules/tryserver/example.expected/with_svn_patch.json @@ -20,7 +20,7 @@ "cmd": [ "patch", "--dir", - "[CWD]", + "[SLAVE_BUILD]", "--force", "--forward", "--remove-empty-files", @@ -38,7 +38,7 @@ "--cached", "--name-only" ], - "cwd": "[CWD]", + "cwd": "[SLAVE_BUILD]", "name": "git diff to analyze patch", "stdout": "/path/to/tmp/", "~followup_annotations": [ diff --git a/recipe_modules/tryserver/example.expected/with_wrong_patch.json b/recipe_modules/tryserver/example.expected/with_wrong_patch.json index 2e04dc40f5..1a2cbcb1e8 100644 --- a/recipe_modules/tryserver/example.expected/with_wrong_patch.json +++ b/recipe_modules/tryserver/example.expected/with_wrong_patch.json @@ -13,7 +13,7 @@ "--cached", "--name-only" ], - "cwd": "[CWD]", + "cwd": "[SLAVE_BUILD]", "name": "git diff to analyze patch", "stdout": "/path/to/tmp/", "~followup_annotations": [ diff --git a/recipe_modules/tryserver/example.py b/recipe_modules/tryserver/example.py index 773c154d97..dead670bf8 100644 --- a/recipe_modules/tryserver/example.py +++ b/recipe_modules/tryserver/example.py @@ -3,7 +3,6 @@ # found in the LICENSE file. DEPS = [ - 'infra_paths', 'recipe_engine/path', 'recipe_engine/platform', 'recipe_engine/properties', @@ -13,7 +12,7 @@ DEPS = [ def RunSteps(api): - api.path['checkout'] = api.infra_paths['slave_build'] + api.path['checkout'] = api.path['slave_build'] api.tryserver.maybe_apply_issue() api.tryserver.get_files_affected_by_patch()