Skip to content

C
Chromium_Depot_tools
Commit 54e0d263 authored by tandrii@chromium.org's avatar tandrii@chromium.org
Browse files
Options

Revert of depot_tools: add infra_paths recipe module for infra-specific paths... 

Revert of depot_tools: add infra_paths recipe module for infra-specific paths (patchset #2 id:20001 of https://codereview.chromium.org/1915463002/ )

Reason for revert:
breaks skia bots :(

Original issue's description:
> depot_tools: add infra_paths recipe module for infra-specific paths
> 
> Depends on https://codereview.chromium.org/1906323003
> 
> BUG=chromium:605919
> 
> Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=300184

TBR=iannucci@chromium.org,martiniss@chromium.org,phajdan.jr@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=chromium:605919

Review URL: https://codereview.chromium.org/1917263002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@300199 0039d316-1c4b-4281-b951-d872f2087c98
parent c767e3f2
Hide whitespace changes
Inline Side-by-side
Showing with 426 additions and 580 deletions
infra/config/recipes.cfg
View file @ 54e0d263
...@@ -5,5 +5,5 @@ deps { ...@@ -5,5 +5,5 @@ deps {
project_id: "recipe_engine" project_id: "recipe_engine"
url: "https://chromium.googlesource.com/external/github.com/luci/recipes-py.git" url: "https://chromium.googlesource.com/external/github.com/luci/recipes-py.git"
branch: "master" branch: "master"
revision: "f712a9271eb999e8b43c48ea9404f4bef393e486" revision: "633abf8d47e44241203369a7e4eb926b832c6dff"
} }
recipe_modules/bot_update/__init__.py
View file @ 54e0d263
DEPS = [ DEPS = [
'gclient', 'gclient',
'infra_paths',
'recipe_engine/json', 'recipe_engine/json',
'recipe_engine/path', 'recipe_engine/path',
'recipe_engine/platform', 'recipe_engine/platform',
......
recipe_modules/bot_update/api.py
View file @ 54e0d263
...@@ -119,9 +119,9 @@ class BotUpdateApi(recipe_api.RecipeApi): ...@@ -119,9 +119,9 @@ class BotUpdateApi(recipe_api.RecipeApi):
# Point to the oauth2 auth files if specified. # Point to the oauth2 auth files if specified.
# These paths are where the bots put their credential files. # These paths are where the bots put their credential files.
if patch_oauth2: if patch_oauth2:
email_file = self.m.infra_paths['build'].join( email_file = self.m.path['build'].join(
'site_config', '.rietveld_client_email') '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') 'site_config', '.rietveld_secret_key')
else: else:
email_file = key_file = None email_file = key_file = None
...@@ -276,7 +276,7 @@ class BotUpdateApi(recipe_api.RecipeApi): ...@@ -276,7 +276,7 @@ class BotUpdateApi(recipe_api.RecipeApi):
# first solution. # first solution.
if step_result.json.output['did_run']: if step_result.json.output['did_run']:
co_root = step_result.json.output['root'] 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: if 'checkout' not in self.m.path:
self.m.path['checkout'] = cwd.join(*co_root.split(self.m.path.sep)) self.m.path['checkout'] = cwd.join(*co_root.split(self.m.path.sep))
......
recipe_modules/bot_update/example.expected/basic.json
View file @ 54e0d263
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
"--revision", "--revision",
"src@abc" "src@abc"
], ],
"cwd": "[SLAVE_BUILD]",
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
......
recipe_modules/bot_update/example.expected/basic_output_manifest.json
View file @ 54e0d263
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
"src@HEAD", "src@HEAD",
"--output_manifest" "--output_manifest"
], ],
"cwd": "[SLAVE_BUILD]",
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
......
recipe_modules/bot_update/example.expected/basic_with_branch_heads.json
View file @ 54e0d263
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
"src@HEAD", "src@HEAD",
"--with_branch_heads" "--with_branch_heads"
], ],
"cwd": "[SLAVE_BUILD]",
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
......
recipe_modules/bot_update/example.expected/clobber.json
View file @ 54e0d263
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
"src@HEAD", "src@HEAD",
"--clobber" "--clobber"
], ],
"cwd": "[SLAVE_BUILD]",
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
......
recipe_modules/bot_update/example.expected/forced.json
View file @ 54e0d263
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
"src@HEAD", "src@HEAD",
"--force" "--force"
], ],
"cwd": "[SLAVE_BUILD]",
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
......
recipe_modules/bot_update/example.expected/gerrit_no_reset.json
View file @ 54e0d263
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
"src@HEAD", "src@HEAD",
"--gerrit_no_reset" "--gerrit_no_reset"
], ],
"cwd": "[SLAVE_BUILD]",
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
......
recipe_modules/bot_update/example.expected/no_shallow.json
View file @ 54e0d263
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
"src@HEAD", "src@HEAD",
"--no_shallow" "--no_shallow"
], ],
"cwd": "[SLAVE_BUILD]",
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
......
recipe_modules/bot_update/example.expected/off.json
View file @ 54e0d263
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
"--revision", "--revision",
"src@HEAD" "src@HEAD"
], ],
"cwd": "[SLAVE_BUILD]",
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
......
recipe_modules/bot_update/example.expected/reset_root_solution_revision.json
View file @ 54e0d263
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
"--revision", "--revision",
"src@revision" "src@revision"
], ],
"cwd": "[SLAVE_BUILD]",
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
......
recipe_modules/bot_update/example.expected/svn_mode.json
View file @ 54e0d263
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
"src@HEAD", "src@HEAD",
"--force" "--force"
], ],
"cwd": "[SLAVE_BUILD]",
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
......
recipe_modules/bot_update/example.expected/trychange.json
View file @ 54e0d263
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
"--refs", "--refs",
"+refs/change/1/2/333" "+refs/change/1/2/333"
], ],
"cwd": "[SLAVE_BUILD]",
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
......
recipe_modules/bot_update/example.expected/trychange_oauth2.json
View file @ 54e0d263
...@@ -19,14 +19,15 @@ ...@@ -19,14 +19,15 @@
"--git-cache-dir", "--git-cache-dir",
"[GIT_CACHE]", "[GIT_CACHE]",
"--apply_issue_email_file", "--apply_issue_email_file",
"[ROOT]/b/build/site_config/.rietveld_client_email", "[BUILD]/site_config/.rietveld_client_email",
"--apply_issue_key_file", "--apply_issue_key_file",
"[ROOT]/b/build/site_config/.rietveld_secret_key", "[BUILD]/site_config/.rietveld_secret_key",
"--output_json", "--output_json",
"/path/to/tmp/json", "/path/to/tmp/json",
"--revision", "--revision",
"src@HEAD" "src@HEAD"
], ],
"cwd": "[SLAVE_BUILD]",
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
......
recipe_modules/bot_update/example.expected/tryjob.json
View file @ 54e0d263
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
"--revision", "--revision",
"src@HEAD" "src@HEAD"
], ],
"cwd": "[SLAVE_BUILD]",
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
......
recipe_modules/bot_update/example.expected/tryjob_fail.json
View file @ 54e0d263
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
"--revision", "--revision",
"src@HEAD" "src@HEAD"
], ],
"cwd": "[SLAVE_BUILD]",
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
......
recipe_modules/bot_update/example.expected/tryjob_fail_patch.json
View file @ 54e0d263
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
"--revision", "--revision",
"src@HEAD" "src@HEAD"
], ],
"cwd": "[SLAVE_BUILD]",
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
...@@ -66,6 +67,7 @@ ...@@ -66,6 +67,7 @@
"-u", "-u",
"import sys; sys.exit(1)" "import sys; sys.exit(1)"
], ],
"cwd": "[SLAVE_BUILD]",
"name": "Patch failure", "name": "Patch failure",
"~followup_annotations": [ "~followup_annotations": [
"step returned non-zero exit code: 1", "step returned non-zero exit code: 1",
......
recipe_modules/bot_update/example.expected/tryjob_fail_patch_download.json
View file @ 54e0d263
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
"--revision", "--revision",
"src@HEAD" "src@HEAD"
], ],
"cwd": "[SLAVE_BUILD]",
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
...@@ -65,6 +66,7 @@ ...@@ -65,6 +66,7 @@
"-u", "-u",
"import sys;print \"Patch download failed. See bot_update step for details\";sys.exit(1)" "import sys;print \"Patch download failed. See bot_update step for details\";sys.exit(1)"
], ],
"cwd": "[SLAVE_BUILD]",
"name": "Patch failure", "name": "Patch failure",
"~followup_annotations": [ "~followup_annotations": [
"step returned non-zero exit code: 1", "step returned non-zero exit code: 1",
......
recipe_modules/bot_update/example.expected/tryjob_gerrit_angle.json
View file @ 54e0d263
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
"--revision", "--revision",
"src/third_party/angle@HEAD" "src/third_party/angle@HEAD"
], ],
"cwd": "[SLAVE_BUILD]",
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
...@@ -46,4 +47,4 @@ ...@@ -46,4 +47,4 @@
"recipe_result": null, "recipe_result": null,
"status_code": 0 "status_code": 0
} }
] ]
\ No newline at end of file
recipe_modules/bot_update/example.expected/tryjob_v8.json
View file @ 54e0d263
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
"--revision", "--revision",
"src/v8@abc" "src/v8@abc"
], ],
"cwd": "[SLAVE_BUILD]",
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
......
recipe_modules/bot_update/example.expected/tryjob_v8_head_by_default.json
View file @ 54e0d263
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
"--revision", "--revision",
"src/v8@HEAD" "src/v8@HEAD"
], ],
"cwd": "[SLAVE_BUILD]",
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
......
recipe_modules/gclient/__init__.py
View file @ 54e0d263
DEPS = [ DEPS = [
'infra_paths',
'recipe_engine/json', 'recipe_engine/json',
'recipe_engine/path', 'recipe_engine/path',
'recipe_engine/platform', 'recipe_engine/platform',
......
recipe_modules/gclient/api.py
View file @ 54e0d263
...@@ -134,7 +134,7 @@ class GclientApi(recipe_api.RecipeApi): ...@@ -134,7 +134,7 @@ class GclientApi(recipe_api.RecipeApi):
def get_config_defaults(self): def get_config_defaults(self):
return { return {
'USE_MIRROR': self.use_mirror, 'USE_MIRROR': self.use_mirror,
'CACHE_DIR': self.m.infra_paths['git_cache'], 'CACHE_DIR': self.m.path['git_cache'],
} }
@staticmethod @staticmethod
...@@ -276,7 +276,7 @@ class GclientApi(recipe_api.RecipeApi): ...@@ -276,7 +276,7 @@ class GclientApi(recipe_api.RecipeApi):
self(name, ['recurse', 'git', 'config', var, val], **kwargs) self(name, ['recurse', 'git', 'config', var, val], **kwargs)
finally: 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: if 'checkout' not in self.m.path:
self.m.path['checkout'] = cwd.join( self.m.path['checkout'] = cwd.join(
*cfg.solutions[0].name.split(self.m.path.sep)) *cfg.solutions[0].name.split(self.m.path.sep))
...@@ -290,13 +290,9 @@ class GclientApi(recipe_api.RecipeApi): ...@@ -290,13 +290,9 @@ class GclientApi(recipe_api.RecipeApi):
prefix = '%sgclient ' % (('[spec: %s] ' % alias) if alias else '') prefix = '%sgclient ' % (('[spec: %s] ' % alias) if alias else '')
return self.m.python(prefix + 'revert', return self.m.python(prefix + 'revert',
self.m.infra_paths['build'].join( self.m.path['build'].join('scripts', 'slave', 'gclient_safe_revert.py'),
'scripts', 'slave', 'gclient_safe_revert.py'), ['.', self.m.path['depot_tools'].join('gclient',
[ platform_ext={'win': '.bat'})],
'.',
self.m.infra_paths['depot_tools'].join(
'gclient', platform_ext={'win': '.bat'})
],
infra_step=True, infra_step=True,
**kwargs **kwargs
) )
...@@ -338,7 +334,7 @@ class GclientApi(recipe_api.RecipeApi): ...@@ -338,7 +334,7 @@ class GclientApi(recipe_api.RecipeApi):
print 'deleting %s' % path_to_file print 'deleting %s' % path_to_file
os.remove(path_to_file) os.remove(path_to_file)
""", """,
args=[self.m.infra_paths['slave_build']], args=[self.m.path['slave_build']],
infra_step=True, infra_step=True,
) )
......
recipe_modules/gclient/example.expected/basic.json
View file @ 54e0d263
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
"--spec", "--spec",
"cache_dir = '[ROOT]/git_cache'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]" "cache_dir = '[ROOT]/git_cache'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]"
], ],
"cwd": "[SLAVE_BUILD]",
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
...@@ -31,6 +32,7 @@ ...@@ -31,6 +32,7 @@
"--output-json", "--output-json",
"/path/to/tmp/json" "/path/to/tmp/json"
], ],
"cwd": "[SLAVE_BUILD]",
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
...@@ -57,6 +59,7 @@ ...@@ -57,6 +59,7 @@
"user.name", "user.name",
"local_bot" "local_bot"
], ],
"cwd": "[SLAVE_BUILD]",
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
...@@ -73,6 +76,7 @@ ...@@ -73,6 +76,7 @@
"user.email", "user.email",
"local_bot@example.com" "local_bot@example.com"
], ],
"cwd": "[SLAVE_BUILD]",
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
...@@ -85,9 +89,9 @@ ...@@ -85,9 +89,9 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"config", "config",
"--spec", "--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": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
...@@ -109,7 +113,7 @@ ...@@ -109,7 +113,7 @@
"--output-json", "--output-json",
"/path/to/tmp/json" "/path/to/tmp/json"
], ],
"cwd": "[CWD]/src/third_party", "cwd": "[SLAVE_BUILD]/src/third_party",
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
...@@ -134,8 +138,9 @@ ...@@ -134,8 +138,9 @@
"python", "python",
"-u", "-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", "\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", "name": "cleanup index.lock",
"~followup_annotations": [ "~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@@@@",
...@@ -159,6 +164,7 @@ ...@@ -159,6 +164,7 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"runhooks" "runhooks"
], ],
"cwd": "[SLAVE_BUILD]",
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
......
recipe_modules/gclient/example.expected/revision.json
View file @ 54e0d263
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
"--spec", "--spec",
"cache_dir = '[ROOT]/git_cache'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]" "cache_dir = '[ROOT]/git_cache'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]"
], ],
"cwd": "[SLAVE_BUILD]",
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
...@@ -33,6 +34,7 @@ ...@@ -33,6 +34,7 @@
"--output-json", "--output-json",
"/path/to/tmp/json" "/path/to/tmp/json"
], ],
"cwd": "[SLAVE_BUILD]",
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
...@@ -59,6 +61,7 @@ ...@@ -59,6 +61,7 @@
"user.name", "user.name",
"local_bot" "local_bot"
], ],
"cwd": "[SLAVE_BUILD]",
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
...@@ -75,6 +78,7 @@ ...@@ -75,6 +78,7 @@
"user.email", "user.email",
"local_bot@example.com" "local_bot@example.com"
], ],
"cwd": "[SLAVE_BUILD]",
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
...@@ -87,9 +91,9 @@ ...@@ -87,9 +91,9 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"config", "config",
"--spec", "--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": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
...@@ -111,7 +115,7 @@ ...@@ -111,7 +115,7 @@
"--output-json", "--output-json",
"/path/to/tmp/json" "/path/to/tmp/json"
], ],
"cwd": "[CWD]/src/third_party", "cwd": "[SLAVE_BUILD]/src/third_party",
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
...@@ -136,8 +140,9 @@ ...@@ -136,8 +140,9 @@
"python", "python",
"-u", "-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", "\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", "name": "cleanup index.lock",
"~followup_annotations": [ "~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@@@@",
...@@ -161,6 +166,7 @@ ...@@ -161,6 +166,7 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"runhooks" "runhooks"
], ],
"cwd": "[SLAVE_BUILD]",
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
......
recipe_modules/gclient/example.expected/tryserver.json
View file @ 54e0d263
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
"--spec", "--spec",
"cache_dir = '[ROOT]/git_cache'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]" "cache_dir = '[ROOT]/git_cache'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]"
], ],
"cwd": "[SLAVE_BUILD]",
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
...@@ -33,6 +34,7 @@ ...@@ -33,6 +34,7 @@
"--output-json", "--output-json",
"/path/to/tmp/json" "/path/to/tmp/json"
], ],
"cwd": "[SLAVE_BUILD]",
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
...@@ -59,6 +61,7 @@ ...@@ -59,6 +61,7 @@
"user.name", "user.name",
"local_bot" "local_bot"
], ],
"cwd": "[SLAVE_BUILD]",
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
...@@ -75,6 +78,7 @@ ...@@ -75,6 +78,7 @@
"user.email", "user.email",
"local_bot@example.com" "local_bot@example.com"
], ],
"cwd": "[SLAVE_BUILD]",
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
...@@ -87,9 +91,9 @@ ...@@ -87,9 +91,9 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"config", "config",
"--spec", "--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": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
...@@ -99,11 +103,11 @@ ...@@ -99,11 +103,11 @@
"cmd": [ "cmd": [
"python", "python",
"-u", "-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" "name": "[spec: WebKit] gclient revert"
}, },
{ {
...@@ -122,7 +126,7 @@ ...@@ -122,7 +126,7 @@
"--output-json", "--output-json",
"/path/to/tmp/json" "/path/to/tmp/json"
], ],
"cwd": "[CWD]/src/third_party", "cwd": "[SLAVE_BUILD]/src/third_party",
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
...@@ -147,8 +151,9 @@ ...@@ -147,8 +151,9 @@
"python", "python",
"-u", "-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", "\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", "name": "cleanup index.lock",
"~followup_annotations": [ "~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@@@@",
...@@ -172,6 +177,7 @@ ...@@ -172,6 +177,7 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"runhooks" "runhooks"
], ],
"cwd": "[SLAVE_BUILD]",
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
......
recipe_modules/gclient/example.py
View file @ 54e0d263
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
DEPS = [ DEPS = [
'gclient', 'gclient',
'infra_paths',
'recipe_engine/path', 'recipe_engine/path',
'recipe_engine/properties', 'recipe_engine/properties',
] ]
...@@ -82,7 +81,7 @@ def RunSteps(api): ...@@ -82,7 +81,7 @@ def RunSteps(api):
api.gclient.checkout( api.gclient.checkout(
gclient_config=bl_cfg, gclient_config=bl_cfg,
with_branch_heads=True, 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() api.gclient.break_locks()
......
recipe_modules/git/__init__.py
View file @ 54e0d263
DEPS = [ DEPS = [
'infra_paths',
'recipe_engine/path', 'recipe_engine/path',
'recipe_engine/platform', 'recipe_engine/platform',
'recipe_engine/properties', 'recipe_engine/properties',
......
recipe_modules/git/api.py
View file @ 54e0d263
...@@ -175,7 +175,7 @@ class GitApi(recipe_api.RecipeApi): ...@@ -175,7 +175,7 @@ class GitApi(recipe_api.RecipeApi):
# ex: ssh://host:repo/foobar/.git # ex: ssh://host:repo/foobar/.git
dir_path = dir_path or dir_path.rsplit('/', 1)[-1] 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: if 'checkout' not in self.m.path:
self.m.path['checkout'] = dir_path self.m.path['checkout'] = dir_path
......
recipe_modules/git/example.expected/basic.json
View file @ 54e0d263
...@@ -5,10 +5,11 @@ ...@@ -5,10 +5,11 @@
"-u", "-u",
"RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
"--path", "--path",
"[CWD]/src", "[SLAVE_BUILD]/src",
"--url", "--url",
"https://chromium.googlesource.com/chromium/src.git" "https://chromium.googlesource.com/chromium/src.git"
], ],
"cwd": "[SLAVE_BUILD]",
"name": "git setup" "name": "git setup"
}, },
{ {
...@@ -20,7 +21,7 @@ ...@@ -20,7 +21,7 @@
"master", "master",
"--recurse-submodules" "--recurse-submodules"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git fetch" "name": "git fetch"
}, },
{ {
...@@ -30,7 +31,7 @@ ...@@ -30,7 +31,7 @@
"-f", "-f",
"FETCH_HEAD" "FETCH_HEAD"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git checkout" "name": "git checkout"
}, },
{ {
...@@ -39,7 +40,7 @@ ...@@ -39,7 +40,7 @@
"rev-parse", "rev-parse",
"HEAD" "HEAD"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "read revision", "name": "read revision",
"stdout": "/path/to/tmp/", "stdout": "/path/to/tmp/",
"~followup_annotations": [ "~followup_annotations": [
...@@ -54,7 +55,7 @@ ...@@ -54,7 +55,7 @@
"-d", "-d",
"-x" "-x"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git clean" "name": "git clean"
}, },
{ {
...@@ -63,7 +64,7 @@ ...@@ -63,7 +64,7 @@
"submodule", "submodule",
"sync" "sync"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "submodule sync" "name": "submodule sync"
}, },
{ {
...@@ -74,7 +75,7 @@ ...@@ -74,7 +75,7 @@
"--init", "--init",
"--recursive" "--recursive"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "submodule update" "name": "submodule update"
}, },
{ {
...@@ -85,7 +86,7 @@ ...@@ -85,7 +86,7 @@
"count-objects", "count-objects",
"-v" "-v"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "count-objects", "name": "count-objects",
"stdout": "/path/to/tmp/" "stdout": "/path/to/tmp/"
}, },
...@@ -96,7 +97,7 @@ ...@@ -96,7 +97,7 @@
"--get", "--get",
"remote.origin.url" "remote.origin.url"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git config remote.origin.url", "name": "git config remote.origin.url",
"stdout": "/path/to/tmp/", "stdout": "/path/to/tmp/",
"~followup_annotations": [ "~followup_annotations": [
...@@ -111,7 +112,7 @@ ...@@ -111,7 +112,7 @@
"--format=%at", "--format=%at",
"-s" "-s"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git show", "name": "git show",
"stdout": "/path/to/tmp/" "stdout": "/path/to/tmp/"
}, },
...@@ -122,7 +123,7 @@ ...@@ -122,7 +123,7 @@
"origin", "origin",
"--tags" "--tags"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git fetch tags" "name": "git fetch tags"
}, },
{ {
...@@ -130,7 +131,7 @@ ...@@ -130,7 +131,7 @@
"git", "git",
"status" "status"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git status" "name": "git status"
}, },
{ {
...@@ -138,7 +139,7 @@ ...@@ -138,7 +139,7 @@
"git", "git",
"status" "status"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git status can_fail_build" "name": "git status can_fail_build"
}, },
{ {
...@@ -146,7 +147,7 @@ ...@@ -146,7 +147,7 @@
"git", "git",
"status" "status"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git status cannot_fail_build" "name": "git status cannot_fail_build"
}, },
{ {
...@@ -155,7 +156,7 @@ ...@@ -155,7 +156,7 @@
"rebase", "rebase",
"origin/master" "origin/master"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "my repo rebase" "name": "my repo rebase"
}, },
{ {
...@@ -163,10 +164,10 @@ ...@@ -163,10 +164,10 @@
"git", "git",
"bundle", "bundle",
"create", "create",
"[CWD]/all.bundle", "[SLAVE_BUILD]/all.bundle",
"--all" "--all"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git bundle" "name": "git bundle"
}, },
{ {
......
recipe_modules/git/example.expected/basic_branch.json
View file @ 54e0d263
...@@ -5,10 +5,11 @@ ...@@ -5,10 +5,11 @@
"-u", "-u",
"RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
"--path", "--path",
"[CWD]/src", "[SLAVE_BUILD]/src",
"--url", "--url",
"https://chromium.googlesource.com/chromium/src.git" "https://chromium.googlesource.com/chromium/src.git"
], ],
"cwd": "[SLAVE_BUILD]",
"name": "git setup" "name": "git setup"
}, },
{ {
...@@ -20,7 +21,7 @@ ...@@ -20,7 +21,7 @@
"testing", "testing",
"--recurse-submodules" "--recurse-submodules"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git fetch" "name": "git fetch"
}, },
{ {
...@@ -30,7 +31,7 @@ ...@@ -30,7 +31,7 @@
"-f", "-f",
"FETCH_HEAD" "FETCH_HEAD"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git checkout" "name": "git checkout"
}, },
{ {
...@@ -39,7 +40,7 @@ ...@@ -39,7 +40,7 @@
"rev-parse", "rev-parse",
"HEAD" "HEAD"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "read revision", "name": "read revision",
"stdout": "/path/to/tmp/", "stdout": "/path/to/tmp/",
"~followup_annotations": [ "~followup_annotations": [
...@@ -54,7 +55,7 @@ ...@@ -54,7 +55,7 @@
"-d", "-d",
"-x" "-x"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git clean" "name": "git clean"
}, },
{ {
...@@ -63,7 +64,7 @@ ...@@ -63,7 +64,7 @@
"submodule", "submodule",
"sync" "sync"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "submodule sync" "name": "submodule sync"
}, },
{ {
...@@ -74,7 +75,7 @@ ...@@ -74,7 +75,7 @@
"--init", "--init",
"--recursive" "--recursive"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "submodule update" "name": "submodule update"
}, },
{ {
...@@ -85,7 +86,7 @@ ...@@ -85,7 +86,7 @@
"count-objects", "count-objects",
"-v" "-v"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "count-objects", "name": "count-objects",
"stdout": "/path/to/tmp/" "stdout": "/path/to/tmp/"
}, },
...@@ -96,7 +97,7 @@ ...@@ -96,7 +97,7 @@
"--get", "--get",
"remote.origin.url" "remote.origin.url"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git config remote.origin.url", "name": "git config remote.origin.url",
"stdout": "/path/to/tmp/", "stdout": "/path/to/tmp/",
"~followup_annotations": [ "~followup_annotations": [
...@@ -111,7 +112,7 @@ ...@@ -111,7 +112,7 @@
"--format=%at", "--format=%at",
"-s" "-s"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git show", "name": "git show",
"stdout": "/path/to/tmp/" "stdout": "/path/to/tmp/"
}, },
...@@ -122,7 +123,7 @@ ...@@ -122,7 +123,7 @@
"origin", "origin",
"--tags" "--tags"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git fetch tags" "name": "git fetch tags"
}, },
{ {
...@@ -130,7 +131,7 @@ ...@@ -130,7 +131,7 @@
"git", "git",
"status" "status"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git status" "name": "git status"
}, },
{ {
...@@ -138,7 +139,7 @@ ...@@ -138,7 +139,7 @@
"git", "git",
"status" "status"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git status can_fail_build" "name": "git status can_fail_build"
}, },
{ {
...@@ -146,7 +147,7 @@ ...@@ -146,7 +147,7 @@
"git", "git",
"status" "status"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git status cannot_fail_build" "name": "git status cannot_fail_build"
}, },
{ {
...@@ -155,7 +156,7 @@ ...@@ -155,7 +156,7 @@
"rebase", "rebase",
"origin/master" "origin/master"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "my repo rebase" "name": "my repo rebase"
}, },
{ {
...@@ -163,10 +164,10 @@ ...@@ -163,10 +164,10 @@
"git", "git",
"bundle", "bundle",
"create", "create",
"[CWD]/all.bundle", "[SLAVE_BUILD]/all.bundle",
"--all" "--all"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git bundle" "name": "git bundle"
}, },
{ {
......
recipe_modules/git/example.expected/basic_file_name.json
View file @ 54e0d263
...@@ -5,10 +5,11 @@ ...@@ -5,10 +5,11 @@
"-u", "-u",
"RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
"--path", "--path",
"[CWD]/src", "[SLAVE_BUILD]/src",
"--url", "--url",
"https://chromium.googlesource.com/chromium/src.git" "https://chromium.googlesource.com/chromium/src.git"
], ],
"cwd": "[SLAVE_BUILD]",
"name": "git setup" "name": "git setup"
}, },
{ {
...@@ -20,7 +21,7 @@ ...@@ -20,7 +21,7 @@
"master", "master",
"--recurse-submodules" "--recurse-submodules"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git fetch" "name": "git fetch"
}, },
{ {
...@@ -32,7 +33,7 @@ ...@@ -32,7 +33,7 @@
"--", "--",
"DEPS" "DEPS"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git checkout" "name": "git checkout"
}, },
{ {
...@@ -41,7 +42,7 @@ ...@@ -41,7 +42,7 @@
"rev-parse", "rev-parse",
"HEAD" "HEAD"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "read revision", "name": "read revision",
"stdout": "/path/to/tmp/", "stdout": "/path/to/tmp/",
"~followup_annotations": [ "~followup_annotations": [
...@@ -56,7 +57,7 @@ ...@@ -56,7 +57,7 @@
"-d", "-d",
"-x" "-x"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git clean" "name": "git clean"
}, },
{ {
...@@ -65,7 +66,7 @@ ...@@ -65,7 +66,7 @@
"submodule", "submodule",
"sync" "sync"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "submodule sync" "name": "submodule sync"
}, },
{ {
...@@ -76,7 +77,7 @@ ...@@ -76,7 +77,7 @@
"--init", "--init",
"--recursive" "--recursive"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "submodule update" "name": "submodule update"
}, },
{ {
...@@ -87,7 +88,7 @@ ...@@ -87,7 +88,7 @@
"count-objects", "count-objects",
"-v" "-v"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "count-objects", "name": "count-objects",
"stdout": "/path/to/tmp/" "stdout": "/path/to/tmp/"
}, },
...@@ -98,7 +99,7 @@ ...@@ -98,7 +99,7 @@
"--get", "--get",
"remote.origin.url" "remote.origin.url"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git config remote.origin.url", "name": "git config remote.origin.url",
"stdout": "/path/to/tmp/", "stdout": "/path/to/tmp/",
"~followup_annotations": [ "~followup_annotations": [
...@@ -113,7 +114,7 @@ ...@@ -113,7 +114,7 @@
"--format=%at", "--format=%at",
"-s" "-s"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git show", "name": "git show",
"stdout": "/path/to/tmp/" "stdout": "/path/to/tmp/"
}, },
...@@ -124,7 +125,7 @@ ...@@ -124,7 +125,7 @@
"origin", "origin",
"--tags" "--tags"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git fetch tags" "name": "git fetch tags"
}, },
{ {
...@@ -132,7 +133,7 @@ ...@@ -132,7 +133,7 @@
"git", "git",
"status" "status"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git status" "name": "git status"
}, },
{ {
...@@ -140,7 +141,7 @@ ...@@ -140,7 +141,7 @@
"git", "git",
"status" "status"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git status can_fail_build" "name": "git status can_fail_build"
}, },
{ {
...@@ -148,7 +149,7 @@ ...@@ -148,7 +149,7 @@
"git", "git",
"status" "status"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git status cannot_fail_build" "name": "git status cannot_fail_build"
}, },
{ {
...@@ -157,7 +158,7 @@ ...@@ -157,7 +158,7 @@
"rebase", "rebase",
"origin/master" "origin/master"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "my repo rebase" "name": "my repo rebase"
}, },
{ {
...@@ -165,10 +166,10 @@ ...@@ -165,10 +166,10 @@
"git", "git",
"bundle", "bundle",
"create", "create",
"[CWD]/all.bundle", "[SLAVE_BUILD]/all.bundle",
"--all" "--all"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git bundle" "name": "git bundle"
}, },
{ {
......
recipe_modules/git/example.expected/basic_hash.json
View file @ 54e0d263
...@@ -5,10 +5,11 @@ ...@@ -5,10 +5,11 @@
"-u", "-u",
"RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
"--path", "--path",
"[CWD]/src", "[SLAVE_BUILD]/src",
"--url", "--url",
"https://chromium.googlesource.com/chromium/src.git" "https://chromium.googlesource.com/chromium/src.git"
], ],
"cwd": "[SLAVE_BUILD]",
"name": "git setup" "name": "git setup"
}, },
{ {
...@@ -19,7 +20,7 @@ ...@@ -19,7 +20,7 @@
"origin", "origin",
"--recurse-submodules" "--recurse-submodules"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git fetch" "name": "git fetch"
}, },
{ {
...@@ -29,7 +30,7 @@ ...@@ -29,7 +30,7 @@
"-f", "-f",
"abcdef0123456789abcdef0123456789abcdef01" "abcdef0123456789abcdef0123456789abcdef01"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git checkout" "name": "git checkout"
}, },
{ {
...@@ -38,7 +39,7 @@ ...@@ -38,7 +39,7 @@
"rev-parse", "rev-parse",
"HEAD" "HEAD"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "read revision", "name": "read revision",
"stdout": "/path/to/tmp/", "stdout": "/path/to/tmp/",
"~followup_annotations": [ "~followup_annotations": [
...@@ -53,7 +54,7 @@ ...@@ -53,7 +54,7 @@
"-d", "-d",
"-x" "-x"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git clean" "name": "git clean"
}, },
{ {
...@@ -62,7 +63,7 @@ ...@@ -62,7 +63,7 @@
"submodule", "submodule",
"sync" "sync"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "submodule sync" "name": "submodule sync"
}, },
{ {
...@@ -73,7 +74,7 @@ ...@@ -73,7 +74,7 @@
"--init", "--init",
"--recursive" "--recursive"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "submodule update" "name": "submodule update"
}, },
{ {
...@@ -84,7 +85,7 @@ ...@@ -84,7 +85,7 @@
"count-objects", "count-objects",
"-v" "-v"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "count-objects", "name": "count-objects",
"stdout": "/path/to/tmp/" "stdout": "/path/to/tmp/"
}, },
...@@ -95,7 +96,7 @@ ...@@ -95,7 +96,7 @@
"--get", "--get",
"remote.origin.url" "remote.origin.url"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git config remote.origin.url", "name": "git config remote.origin.url",
"stdout": "/path/to/tmp/", "stdout": "/path/to/tmp/",
"~followup_annotations": [ "~followup_annotations": [
...@@ -110,7 +111,7 @@ ...@@ -110,7 +111,7 @@
"--format=%at", "--format=%at",
"-s" "-s"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git show", "name": "git show",
"stdout": "/path/to/tmp/" "stdout": "/path/to/tmp/"
}, },
...@@ -121,7 +122,7 @@ ...@@ -121,7 +122,7 @@
"origin", "origin",
"--tags" "--tags"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git fetch tags" "name": "git fetch tags"
}, },
{ {
...@@ -129,7 +130,7 @@ ...@@ -129,7 +130,7 @@
"git", "git",
"status" "status"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git status" "name": "git status"
}, },
{ {
...@@ -137,7 +138,7 @@ ...@@ -137,7 +138,7 @@
"git", "git",
"status" "status"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git status can_fail_build" "name": "git status can_fail_build"
}, },
{ {
...@@ -145,7 +146,7 @@ ...@@ -145,7 +146,7 @@
"git", "git",
"status" "status"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git status cannot_fail_build" "name": "git status cannot_fail_build"
}, },
{ {
...@@ -154,7 +155,7 @@ ...@@ -154,7 +155,7 @@
"rebase", "rebase",
"origin/master" "origin/master"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "my repo rebase" "name": "my repo rebase"
}, },
{ {
...@@ -162,10 +163,10 @@ ...@@ -162,10 +163,10 @@
"git", "git",
"bundle", "bundle",
"create", "create",
"[CWD]/all.bundle", "[SLAVE_BUILD]/all.bundle",
"--all" "--all"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git bundle" "name": "git bundle"
}, },
{ {
......
recipe_modules/git/example.expected/basic_ref.json
View file @ 54e0d263
...@@ -5,10 +5,11 @@ ...@@ -5,10 +5,11 @@
"-u", "-u",
"RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
"--path", "--path",
"[CWD]/src", "[SLAVE_BUILD]/src",
"--url", "--url",
"https://chromium.googlesource.com/chromium/src.git" "https://chromium.googlesource.com/chromium/src.git"
], ],
"cwd": "[SLAVE_BUILD]",
"name": "git setup" "name": "git setup"
}, },
{ {
...@@ -20,7 +21,7 @@ ...@@ -20,7 +21,7 @@
"refs/foo/bar", "refs/foo/bar",
"--recurse-submodules" "--recurse-submodules"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git fetch" "name": "git fetch"
}, },
{ {
...@@ -30,7 +31,7 @@ ...@@ -30,7 +31,7 @@
"-f", "-f",
"FETCH_HEAD" "FETCH_HEAD"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git checkout" "name": "git checkout"
}, },
{ {
...@@ -39,7 +40,7 @@ ...@@ -39,7 +40,7 @@
"rev-parse", "rev-parse",
"HEAD" "HEAD"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "read revision", "name": "read revision",
"stdout": "/path/to/tmp/", "stdout": "/path/to/tmp/",
"~followup_annotations": [ "~followup_annotations": [
...@@ -54,7 +55,7 @@ ...@@ -54,7 +55,7 @@
"-d", "-d",
"-x" "-x"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git clean" "name": "git clean"
}, },
{ {
...@@ -63,7 +64,7 @@ ...@@ -63,7 +64,7 @@
"submodule", "submodule",
"sync" "sync"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "submodule sync" "name": "submodule sync"
}, },
{ {
...@@ -74,7 +75,7 @@ ...@@ -74,7 +75,7 @@
"--init", "--init",
"--recursive" "--recursive"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "submodule update" "name": "submodule update"
}, },
{ {
...@@ -85,7 +86,7 @@ ...@@ -85,7 +86,7 @@
"count-objects", "count-objects",
"-v" "-v"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "count-objects", "name": "count-objects",
"stdout": "/path/to/tmp/" "stdout": "/path/to/tmp/"
}, },
...@@ -96,7 +97,7 @@ ...@@ -96,7 +97,7 @@
"--get", "--get",
"remote.origin.url" "remote.origin.url"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git config remote.origin.url", "name": "git config remote.origin.url",
"stdout": "/path/to/tmp/", "stdout": "/path/to/tmp/",
"~followup_annotations": [ "~followup_annotations": [
...@@ -111,7 +112,7 @@ ...@@ -111,7 +112,7 @@
"--format=%at", "--format=%at",
"-s" "-s"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git show", "name": "git show",
"stdout": "/path/to/tmp/" "stdout": "/path/to/tmp/"
}, },
...@@ -122,7 +123,7 @@ ...@@ -122,7 +123,7 @@
"origin", "origin",
"--tags" "--tags"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git fetch tags" "name": "git fetch tags"
}, },
{ {
...@@ -130,7 +131,7 @@ ...@@ -130,7 +131,7 @@
"git", "git",
"status" "status"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git status" "name": "git status"
}, },
{ {
...@@ -138,7 +139,7 @@ ...@@ -138,7 +139,7 @@
"git", "git",
"status" "status"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git status can_fail_build" "name": "git status can_fail_build"
}, },
{ {
...@@ -146,7 +147,7 @@ ...@@ -146,7 +147,7 @@
"git", "git",
"status" "status"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git status cannot_fail_build" "name": "git status cannot_fail_build"
}, },
{ {
...@@ -155,7 +156,7 @@ ...@@ -155,7 +156,7 @@
"rebase", "rebase",
"origin/master" "origin/master"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "my repo rebase" "name": "my repo rebase"
}, },
{ {
...@@ -163,10 +164,10 @@ ...@@ -163,10 +164,10 @@
"git", "git",
"bundle", "bundle",
"create", "create",
"[CWD]/all.bundle", "[SLAVE_BUILD]/all.bundle",
"--all" "--all"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git bundle" "name": "git bundle"
}, },
{ {
......
recipe_modules/git/example.expected/basic_submodule_update_force.json
View file @ 54e0d263
...@@ -5,10 +5,11 @@ ...@@ -5,10 +5,11 @@
"-u", "-u",
"RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
"--path", "--path",
"[CWD]/src", "[SLAVE_BUILD]/src",
"--url", "--url",
"https://chromium.googlesource.com/chromium/src.git" "https://chromium.googlesource.com/chromium/src.git"
], ],
"cwd": "[SLAVE_BUILD]",
"name": "git setup" "name": "git setup"
}, },
{ {
...@@ -20,7 +21,7 @@ ...@@ -20,7 +21,7 @@
"master", "master",
"--recurse-submodules" "--recurse-submodules"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git fetch" "name": "git fetch"
}, },
{ {
...@@ -30,7 +31,7 @@ ...@@ -30,7 +31,7 @@
"-f", "-f",
"FETCH_HEAD" "FETCH_HEAD"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git checkout" "name": "git checkout"
}, },
{ {
...@@ -39,7 +40,7 @@ ...@@ -39,7 +40,7 @@
"rev-parse", "rev-parse",
"HEAD" "HEAD"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "read revision", "name": "read revision",
"stdout": "/path/to/tmp/", "stdout": "/path/to/tmp/",
"~followup_annotations": [ "~followup_annotations": [
...@@ -54,7 +55,7 @@ ...@@ -54,7 +55,7 @@
"-d", "-d",
"-x" "-x"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git clean" "name": "git clean"
}, },
{ {
...@@ -63,7 +64,7 @@ ...@@ -63,7 +64,7 @@
"submodule", "submodule",
"sync" "sync"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "submodule sync" "name": "submodule sync"
}, },
{ {
...@@ -75,7 +76,7 @@ ...@@ -75,7 +76,7 @@
"--recursive", "--recursive",
"--force" "--force"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "submodule update" "name": "submodule update"
}, },
{ {
...@@ -86,7 +87,7 @@ ...@@ -86,7 +87,7 @@
"count-objects", "count-objects",
"-v" "-v"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "count-objects", "name": "count-objects",
"stdout": "/path/to/tmp/" "stdout": "/path/to/tmp/"
}, },
...@@ -97,7 +98,7 @@ ...@@ -97,7 +98,7 @@
"--get", "--get",
"remote.origin.url" "remote.origin.url"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git config remote.origin.url", "name": "git config remote.origin.url",
"stdout": "/path/to/tmp/", "stdout": "/path/to/tmp/",
"~followup_annotations": [ "~followup_annotations": [
...@@ -112,7 +113,7 @@ ...@@ -112,7 +113,7 @@
"--format=%at", "--format=%at",
"-s" "-s"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git show", "name": "git show",
"stdout": "/path/to/tmp/" "stdout": "/path/to/tmp/"
}, },
...@@ -123,7 +124,7 @@ ...@@ -123,7 +124,7 @@
"origin", "origin",
"--tags" "--tags"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git fetch tags" "name": "git fetch tags"
}, },
{ {
...@@ -131,7 +132,7 @@ ...@@ -131,7 +132,7 @@
"git", "git",
"status" "status"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git status" "name": "git status"
}, },
{ {
...@@ -139,7 +140,7 @@ ...@@ -139,7 +140,7 @@
"git", "git",
"status" "status"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git status can_fail_build" "name": "git status can_fail_build"
}, },
{ {
...@@ -147,7 +148,7 @@ ...@@ -147,7 +148,7 @@
"git", "git",
"status" "status"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git status cannot_fail_build" "name": "git status cannot_fail_build"
}, },
{ {
...@@ -156,7 +157,7 @@ ...@@ -156,7 +157,7 @@
"rebase", "rebase",
"origin/master" "origin/master"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "my repo rebase" "name": "my repo rebase"
}, },
{ {
...@@ -164,10 +165,10 @@ ...@@ -164,10 +165,10 @@
"git", "git",
"bundle", "bundle",
"create", "create",
"[CWD]/all.bundle", "[SLAVE_BUILD]/all.bundle",
"--all" "--all"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git bundle" "name": "git bundle"
}, },
{ {
......
recipe_modules/git/example.expected/can_fail_build.json
View file @ 54e0d263
...@@ -5,10 +5,11 @@ ...@@ -5,10 +5,11 @@
"-u", "-u",
"RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
"--path", "--path",
"[CWD]/src", "[SLAVE_BUILD]/src",
"--url", "--url",
"https://chromium.googlesource.com/chromium/src.git" "https://chromium.googlesource.com/chromium/src.git"
], ],
"cwd": "[SLAVE_BUILD]",
"name": "git setup" "name": "git setup"
}, },
{ {
...@@ -20,7 +21,7 @@ ...@@ -20,7 +21,7 @@
"master", "master",
"--recurse-submodules" "--recurse-submodules"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git fetch" "name": "git fetch"
}, },
{ {
...@@ -30,7 +31,7 @@ ...@@ -30,7 +31,7 @@
"-f", "-f",
"FETCH_HEAD" "FETCH_HEAD"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git checkout" "name": "git checkout"
}, },
{ {
...@@ -39,7 +40,7 @@ ...@@ -39,7 +40,7 @@
"rev-parse", "rev-parse",
"HEAD" "HEAD"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "read revision", "name": "read revision",
"stdout": "/path/to/tmp/", "stdout": "/path/to/tmp/",
"~followup_annotations": [ "~followup_annotations": [
...@@ -54,7 +55,7 @@ ...@@ -54,7 +55,7 @@
"-d", "-d",
"-x" "-x"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git clean" "name": "git clean"
}, },
{ {
...@@ -63,7 +64,7 @@ ...@@ -63,7 +64,7 @@
"submodule", "submodule",
"sync" "sync"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "submodule sync" "name": "submodule sync"
}, },
{ {
...@@ -74,7 +75,7 @@ ...@@ -74,7 +75,7 @@
"--init", "--init",
"--recursive" "--recursive"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "submodule update" "name": "submodule update"
}, },
{ {
...@@ -85,7 +86,7 @@ ...@@ -85,7 +86,7 @@
"count-objects", "count-objects",
"-v" "-v"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "count-objects", "name": "count-objects",
"stdout": "/path/to/tmp/" "stdout": "/path/to/tmp/"
}, },
...@@ -96,7 +97,7 @@ ...@@ -96,7 +97,7 @@
"--get", "--get",
"remote.origin.url" "remote.origin.url"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git config remote.origin.url", "name": "git config remote.origin.url",
"stdout": "/path/to/tmp/", "stdout": "/path/to/tmp/",
"~followup_annotations": [ "~followup_annotations": [
...@@ -111,7 +112,7 @@ ...@@ -111,7 +112,7 @@
"--format=%at", "--format=%at",
"-s" "-s"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git show", "name": "git show",
"stdout": "/path/to/tmp/" "stdout": "/path/to/tmp/"
}, },
...@@ -122,7 +123,7 @@ ...@@ -122,7 +123,7 @@
"origin", "origin",
"--tags" "--tags"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git fetch tags" "name": "git fetch tags"
}, },
{ {
...@@ -130,7 +131,7 @@ ...@@ -130,7 +131,7 @@
"git", "git",
"status" "status"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git status" "name": "git status"
}, },
{ {
...@@ -138,7 +139,7 @@ ...@@ -138,7 +139,7 @@
"git", "git",
"status" "status"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git status can_fail_build", "name": "git status can_fail_build",
"~followup_annotations": [ "~followup_annotations": [
"step returned non-zero exit code: 1", "step returned non-zero exit code: 1",
......
recipe_modules/git/example.expected/cannot_fail_build.json
View file @ 54e0d263
...@@ -5,10 +5,11 @@ ...@@ -5,10 +5,11 @@
"-u", "-u",
"RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
"--path", "--path",
"[CWD]/src", "[SLAVE_BUILD]/src",
"--url", "--url",
"https://chromium.googlesource.com/chromium/src.git" "https://chromium.googlesource.com/chromium/src.git"
], ],
"cwd": "[SLAVE_BUILD]",
"name": "git setup" "name": "git setup"
}, },
{ {
...@@ -20,7 +21,7 @@ ...@@ -20,7 +21,7 @@
"master", "master",
"--recurse-submodules" "--recurse-submodules"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git fetch" "name": "git fetch"
}, },
{ {
...@@ -30,7 +31,7 @@ ...@@ -30,7 +31,7 @@
"-f", "-f",
"FETCH_HEAD" "FETCH_HEAD"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git checkout" "name": "git checkout"
}, },
{ {
...@@ -39,7 +40,7 @@ ...@@ -39,7 +40,7 @@
"rev-parse", "rev-parse",
"HEAD" "HEAD"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "read revision", "name": "read revision",
"stdout": "/path/to/tmp/", "stdout": "/path/to/tmp/",
"~followup_annotations": [ "~followup_annotations": [
...@@ -54,7 +55,7 @@ ...@@ -54,7 +55,7 @@
"-d", "-d",
"-x" "-x"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git clean" "name": "git clean"
}, },
{ {
...@@ -63,7 +64,7 @@ ...@@ -63,7 +64,7 @@
"submodule", "submodule",
"sync" "sync"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "submodule sync" "name": "submodule sync"
}, },
{ {
...@@ -74,7 +75,7 @@ ...@@ -74,7 +75,7 @@
"--init", "--init",
"--recursive" "--recursive"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "submodule update" "name": "submodule update"
}, },
{ {
...@@ -85,7 +86,7 @@ ...@@ -85,7 +86,7 @@
"count-objects", "count-objects",
"-v" "-v"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "count-objects", "name": "count-objects",
"stdout": "/path/to/tmp/" "stdout": "/path/to/tmp/"
}, },
...@@ -96,7 +97,7 @@ ...@@ -96,7 +97,7 @@
"--get", "--get",
"remote.origin.url" "remote.origin.url"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git config remote.origin.url", "name": "git config remote.origin.url",
"stdout": "/path/to/tmp/", "stdout": "/path/to/tmp/",
"~followup_annotations": [ "~followup_annotations": [
...@@ -111,7 +112,7 @@ ...@@ -111,7 +112,7 @@
"--format=%at", "--format=%at",
"-s" "-s"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git show", "name": "git show",
"stdout": "/path/to/tmp/" "stdout": "/path/to/tmp/"
}, },
...@@ -122,7 +123,7 @@ ...@@ -122,7 +123,7 @@
"origin", "origin",
"--tags" "--tags"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git fetch tags" "name": "git fetch tags"
}, },
{ {
...@@ -130,7 +131,7 @@ ...@@ -130,7 +131,7 @@
"git", "git",
"status" "status"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git status" "name": "git status"
}, },
{ {
...@@ -138,7 +139,7 @@ ...@@ -138,7 +139,7 @@
"git", "git",
"status" "status"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git status can_fail_build" "name": "git status can_fail_build"
}, },
{ {
...@@ -146,7 +147,7 @@ ...@@ -146,7 +147,7 @@
"git", "git",
"status" "status"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git status cannot_fail_build", "name": "git status cannot_fail_build",
"~followup_annotations": [ "~followup_annotations": [
"step returned non-zero exit code: 1", "step returned non-zero exit code: 1",
...@@ -159,7 +160,7 @@ ...@@ -159,7 +160,7 @@
"rebase", "rebase",
"origin/master" "origin/master"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "my repo rebase" "name": "my repo rebase"
}, },
{ {
...@@ -167,10 +168,10 @@ ...@@ -167,10 +168,10 @@
"git", "git",
"bundle", "bundle",
"create", "create",
"[CWD]/all.bundle", "[SLAVE_BUILD]/all.bundle",
"--all" "--all"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git bundle" "name": "git bundle"
}, },
{ {
......
recipe_modules/git/example.expected/cat-file_test.json
View file @ 54e0d263
...@@ -5,10 +5,11 @@ ...@@ -5,10 +5,11 @@
"-u", "-u",
"RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
"--path", "--path",
"[CWD]/src", "[SLAVE_BUILD]/src",
"--url", "--url",
"https://chromium.googlesource.com/chromium/src.git" "https://chromium.googlesource.com/chromium/src.git"
], ],
"cwd": "[SLAVE_BUILD]",
"name": "git setup" "name": "git setup"
}, },
{ {
...@@ -20,7 +21,7 @@ ...@@ -20,7 +21,7 @@
"abcdef12345", "abcdef12345",
"--recurse-submodules" "--recurse-submodules"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git fetch" "name": "git fetch"
}, },
{ {
...@@ -30,7 +31,7 @@ ...@@ -30,7 +31,7 @@
"-f", "-f",
"FETCH_HEAD" "FETCH_HEAD"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git checkout" "name": "git checkout"
}, },
{ {
...@@ -39,7 +40,7 @@ ...@@ -39,7 +40,7 @@
"rev-parse", "rev-parse",
"HEAD" "HEAD"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "read revision", "name": "read revision",
"stdout": "/path/to/tmp/", "stdout": "/path/to/tmp/",
"~followup_annotations": [ "~followup_annotations": [
...@@ -54,7 +55,7 @@ ...@@ -54,7 +55,7 @@
"-d", "-d",
"-x" "-x"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git clean" "name": "git clean"
}, },
{ {
...@@ -63,7 +64,7 @@ ...@@ -63,7 +64,7 @@
"submodule", "submodule",
"sync" "sync"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "submodule sync" "name": "submodule sync"
}, },
{ {
...@@ -74,7 +75,7 @@ ...@@ -74,7 +75,7 @@
"--init", "--init",
"--recursive" "--recursive"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "submodule update" "name": "submodule update"
}, },
{ {
...@@ -85,7 +86,7 @@ ...@@ -85,7 +86,7 @@
"count-objects", "count-objects",
"-v" "-v"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "count-objects", "name": "count-objects",
"stdout": "/path/to/tmp/" "stdout": "/path/to/tmp/"
}, },
...@@ -96,7 +97,7 @@ ...@@ -96,7 +97,7 @@
"--get", "--get",
"remote.origin.url" "remote.origin.url"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git config remote.origin.url", "name": "git config remote.origin.url",
"stdout": "/path/to/tmp/", "stdout": "/path/to/tmp/",
"~followup_annotations": [ "~followup_annotations": [
...@@ -111,7 +112,7 @@ ...@@ -111,7 +112,7 @@
"--format=%at", "--format=%at",
"-s" "-s"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git show", "name": "git show",
"stdout": "/path/to/tmp/" "stdout": "/path/to/tmp/"
}, },
...@@ -122,7 +123,7 @@ ...@@ -122,7 +123,7 @@
"origin", "origin",
"--tags" "--tags"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git fetch tags" "name": "git fetch tags"
}, },
{ {
...@@ -130,7 +131,7 @@ ...@@ -130,7 +131,7 @@
"git", "git",
"status" "status"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git status" "name": "git status"
}, },
{ {
...@@ -138,7 +139,7 @@ ...@@ -138,7 +139,7 @@
"git", "git",
"status" "status"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git status can_fail_build" "name": "git status can_fail_build"
}, },
{ {
...@@ -146,7 +147,7 @@ ...@@ -146,7 +147,7 @@
"git", "git",
"status" "status"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git status cannot_fail_build" "name": "git status cannot_fail_build"
}, },
{ {
...@@ -155,7 +156,7 @@ ...@@ -155,7 +156,7 @@
"rebase", "rebase",
"origin/master" "origin/master"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "my repo rebase" "name": "my repo rebase"
}, },
{ {
...@@ -165,7 +166,7 @@ ...@@ -165,7 +166,7 @@
"origin", "origin",
"--tags" "--tags"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git fetch tags (2)", "name": "git fetch tags (2)",
"stdout": "/path/to/tmp/" "stdout": "/path/to/tmp/"
}, },
...@@ -176,7 +177,7 @@ ...@@ -176,7 +177,7 @@
"blob", "blob",
"abcdef12345:TestFile" "abcdef12345:TestFile"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git cat-file abcdef12345:TestFile", "name": "git cat-file abcdef12345:TestFile",
"stdout": "/path/to/tmp/" "stdout": "/path/to/tmp/"
}, },
...@@ -185,10 +186,10 @@ ...@@ -185,10 +186,10 @@
"git", "git",
"bundle", "bundle",
"create", "create",
"[CWD]/all.bundle", "[SLAVE_BUILD]/all.bundle",
"--all" "--all"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git bundle" "name": "git bundle"
}, },
{ {
......
recipe_modules/git/example.expected/count-objects_delta.json
View file @ 54e0d263
...@@ -5,10 +5,11 @@ ...@@ -5,10 +5,11 @@
"-u", "-u",
"RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
"--path", "--path",
"[CWD]/src", "[SLAVE_BUILD]/src",
"--url", "--url",
"https://chromium.googlesource.com/chromium/src.git" "https://chromium.googlesource.com/chromium/src.git"
], ],
"cwd": "[SLAVE_BUILD]",
"name": "git setup" "name": "git setup"
}, },
{ {
...@@ -17,7 +18,7 @@ ...@@ -17,7 +18,7 @@
"count-objects", "count-objects",
"-v" "-v"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "count-objects before git fetch", "name": "count-objects before git fetch",
"stdout": "/path/to/tmp/", "stdout": "/path/to/tmp/",
"~followup_annotations": [ "~followup_annotations": [
...@@ -41,7 +42,7 @@ ...@@ -41,7 +42,7 @@
"master", "master",
"--recurse-submodules" "--recurse-submodules"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git fetch" "name": "git fetch"
}, },
{ {
...@@ -50,7 +51,7 @@ ...@@ -50,7 +51,7 @@
"count-objects", "count-objects",
"-v" "-v"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "count-objects after git fetch", "name": "count-objects after git fetch",
"stdout": "/path/to/tmp/", "stdout": "/path/to/tmp/",
"~followup_annotations": [ "~followup_annotations": [
...@@ -103,7 +104,7 @@ ...@@ -103,7 +104,7 @@
"-f", "-f",
"FETCH_HEAD" "FETCH_HEAD"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git checkout" "name": "git checkout"
}, },
{ {
...@@ -112,7 +113,7 @@ ...@@ -112,7 +113,7 @@
"rev-parse", "rev-parse",
"HEAD" "HEAD"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "read revision", "name": "read revision",
"stdout": "/path/to/tmp/", "stdout": "/path/to/tmp/",
"~followup_annotations": [ "~followup_annotations": [
...@@ -127,7 +128,7 @@ ...@@ -127,7 +128,7 @@
"-d", "-d",
"-x" "-x"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git clean" "name": "git clean"
}, },
{ {
...@@ -136,7 +137,7 @@ ...@@ -136,7 +137,7 @@
"submodule", "submodule",
"sync" "sync"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "submodule sync" "name": "submodule sync"
}, },
{ {
...@@ -147,7 +148,7 @@ ...@@ -147,7 +148,7 @@
"--init", "--init",
"--recursive" "--recursive"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "submodule update" "name": "submodule update"
}, },
{ {
...@@ -158,7 +159,7 @@ ...@@ -158,7 +159,7 @@
"count-objects", "count-objects",
"-v" "-v"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "count-objects", "name": "count-objects",
"stdout": "/path/to/tmp/" "stdout": "/path/to/tmp/"
}, },
...@@ -169,7 +170,7 @@ ...@@ -169,7 +170,7 @@
"--get", "--get",
"remote.origin.url" "remote.origin.url"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git config remote.origin.url", "name": "git config remote.origin.url",
"stdout": "/path/to/tmp/", "stdout": "/path/to/tmp/",
"~followup_annotations": [ "~followup_annotations": [
...@@ -184,7 +185,7 @@ ...@@ -184,7 +185,7 @@
"--format=%at", "--format=%at",
"-s" "-s"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git show", "name": "git show",
"stdout": "/path/to/tmp/" "stdout": "/path/to/tmp/"
}, },
...@@ -195,7 +196,7 @@ ...@@ -195,7 +196,7 @@
"origin", "origin",
"--tags" "--tags"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git fetch tags" "name": "git fetch tags"
}, },
{ {
...@@ -203,7 +204,7 @@ ...@@ -203,7 +204,7 @@
"git", "git",
"status" "status"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git status" "name": "git status"
}, },
{ {
...@@ -211,7 +212,7 @@ ...@@ -211,7 +212,7 @@
"git", "git",
"status" "status"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git status can_fail_build" "name": "git status can_fail_build"
}, },
{ {
...@@ -219,7 +220,7 @@ ...@@ -219,7 +220,7 @@
"git", "git",
"status" "status"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git status cannot_fail_build" "name": "git status cannot_fail_build"
}, },
{ {
...@@ -228,7 +229,7 @@ ...@@ -228,7 +229,7 @@
"rebase", "rebase",
"origin/master" "origin/master"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "my repo rebase" "name": "my repo rebase"
}, },
{ {
...@@ -236,10 +237,10 @@ ...@@ -236,10 +237,10 @@
"git", "git",
"bundle", "bundle",
"create", "create",
"[CWD]/all.bundle", "[SLAVE_BUILD]/all.bundle",
"--all" "--all"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git bundle" "name": "git bundle"
}, },
{ {
......
recipe_modules/git/example.expected/count-objects_failed.json
View file @ 54e0d263
...@@ -5,10 +5,11 @@ ...@@ -5,10 +5,11 @@
"-u", "-u",
"RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
"--path", "--path",
"[CWD]/src", "[SLAVE_BUILD]/src",
"--url", "--url",
"https://chromium.googlesource.com/chromium/src.git" "https://chromium.googlesource.com/chromium/src.git"
], ],
"cwd": "[SLAVE_BUILD]",
"name": "git setup" "name": "git setup"
}, },
{ {
...@@ -20,7 +21,7 @@ ...@@ -20,7 +21,7 @@
"master", "master",
"--recurse-submodules" "--recurse-submodules"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git fetch" "name": "git fetch"
}, },
{ {
...@@ -30,7 +31,7 @@ ...@@ -30,7 +31,7 @@
"-f", "-f",
"FETCH_HEAD" "FETCH_HEAD"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git checkout" "name": "git checkout"
}, },
{ {
...@@ -39,7 +40,7 @@ ...@@ -39,7 +40,7 @@
"rev-parse", "rev-parse",
"HEAD" "HEAD"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "read revision", "name": "read revision",
"stdout": "/path/to/tmp/", "stdout": "/path/to/tmp/",
"~followup_annotations": [ "~followup_annotations": [
...@@ -54,7 +55,7 @@ ...@@ -54,7 +55,7 @@
"-d", "-d",
"-x" "-x"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git clean" "name": "git clean"
}, },
{ {
...@@ -63,7 +64,7 @@ ...@@ -63,7 +64,7 @@
"submodule", "submodule",
"sync" "sync"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "submodule sync" "name": "submodule sync"
}, },
{ {
...@@ -74,7 +75,7 @@ ...@@ -74,7 +75,7 @@
"--init", "--init",
"--recursive" "--recursive"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "submodule update" "name": "submodule update"
}, },
{ {
...@@ -85,7 +86,7 @@ ...@@ -85,7 +86,7 @@
"count-objects", "count-objects",
"-v" "-v"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "count-objects", "name": "count-objects",
"stdout": "/path/to/tmp/", "stdout": "/path/to/tmp/",
"~followup_annotations": [ "~followup_annotations": [
...@@ -100,7 +101,7 @@ ...@@ -100,7 +101,7 @@
"--get", "--get",
"remote.origin.url" "remote.origin.url"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git config remote.origin.url", "name": "git config remote.origin.url",
"stdout": "/path/to/tmp/", "stdout": "/path/to/tmp/",
"~followup_annotations": [ "~followup_annotations": [
...@@ -115,7 +116,7 @@ ...@@ -115,7 +116,7 @@
"--format=%at", "--format=%at",
"-s" "-s"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git show", "name": "git show",
"stdout": "/path/to/tmp/" "stdout": "/path/to/tmp/"
}, },
...@@ -126,7 +127,7 @@ ...@@ -126,7 +127,7 @@
"origin", "origin",
"--tags" "--tags"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git fetch tags" "name": "git fetch tags"
}, },
{ {
...@@ -134,7 +135,7 @@ ...@@ -134,7 +135,7 @@
"git", "git",
"status" "status"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git status" "name": "git status"
}, },
{ {
...@@ -142,7 +143,7 @@ ...@@ -142,7 +143,7 @@
"git", "git",
"status" "status"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git status can_fail_build" "name": "git status can_fail_build"
}, },
{ {
...@@ -150,7 +151,7 @@ ...@@ -150,7 +151,7 @@
"git", "git",
"status" "status"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git status cannot_fail_build" "name": "git status cannot_fail_build"
}, },
{ {
...@@ -159,7 +160,7 @@ ...@@ -159,7 +160,7 @@
"rebase", "rebase",
"origin/master" "origin/master"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "my repo rebase" "name": "my repo rebase"
}, },
{ {
...@@ -167,10 +168,10 @@ ...@@ -167,10 +168,10 @@
"git", "git",
"bundle", "bundle",
"create", "create",
"[CWD]/all.bundle", "[SLAVE_BUILD]/all.bundle",
"--all" "--all"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git bundle" "name": "git bundle"
}, },
{ {
......
recipe_modules/git/example.expected/count-objects_with_bad_output.json
View file @ 54e0d263
...@@ -5,10 +5,11 @@ ...@@ -5,10 +5,11 @@
"-u", "-u",
"RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
"--path", "--path",
"[CWD]/src", "[SLAVE_BUILD]/src",
"--url", "--url",
"https://chromium.googlesource.com/chromium/src.git" "https://chromium.googlesource.com/chromium/src.git"
], ],
"cwd": "[SLAVE_BUILD]",
"name": "git setup" "name": "git setup"
}, },
{ {
...@@ -20,7 +21,7 @@ ...@@ -20,7 +21,7 @@
"master", "master",
"--recurse-submodules" "--recurse-submodules"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git fetch" "name": "git fetch"
}, },
{ {
...@@ -30,7 +31,7 @@ ...@@ -30,7 +31,7 @@
"-f", "-f",
"FETCH_HEAD" "FETCH_HEAD"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git checkout" "name": "git checkout"
}, },
{ {
...@@ -39,7 +40,7 @@ ...@@ -39,7 +40,7 @@
"rev-parse", "rev-parse",
"HEAD" "HEAD"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "read revision", "name": "read revision",
"stdout": "/path/to/tmp/", "stdout": "/path/to/tmp/",
"~followup_annotations": [ "~followup_annotations": [
...@@ -54,7 +55,7 @@ ...@@ -54,7 +55,7 @@
"-d", "-d",
"-x" "-x"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git clean" "name": "git clean"
}, },
{ {
...@@ -63,7 +64,7 @@ ...@@ -63,7 +64,7 @@
"submodule", "submodule",
"sync" "sync"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "submodule sync" "name": "submodule sync"
}, },
{ {
...@@ -74,7 +75,7 @@ ...@@ -74,7 +75,7 @@
"--init", "--init",
"--recursive" "--recursive"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "submodule update" "name": "submodule update"
}, },
{ {
...@@ -85,7 +86,7 @@ ...@@ -85,7 +86,7 @@
"count-objects", "count-objects",
"-v" "-v"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "count-objects", "name": "count-objects",
"stdout": "/path/to/tmp/", "stdout": "/path/to/tmp/",
"~followup_annotations": [ "~followup_annotations": [
...@@ -101,7 +102,7 @@ ...@@ -101,7 +102,7 @@
"--get", "--get",
"remote.origin.url" "remote.origin.url"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git config remote.origin.url", "name": "git config remote.origin.url",
"stdout": "/path/to/tmp/", "stdout": "/path/to/tmp/",
"~followup_annotations": [ "~followup_annotations": [
...@@ -116,7 +117,7 @@ ...@@ -116,7 +117,7 @@
"--format=%at", "--format=%at",
"-s" "-s"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git show", "name": "git show",
"stdout": "/path/to/tmp/" "stdout": "/path/to/tmp/"
}, },
...@@ -127,7 +128,7 @@ ...@@ -127,7 +128,7 @@
"origin", "origin",
"--tags" "--tags"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git fetch tags" "name": "git fetch tags"
}, },
{ {
...@@ -135,7 +136,7 @@ ...@@ -135,7 +136,7 @@
"git", "git",
"status" "status"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git status" "name": "git status"
}, },
{ {
...@@ -143,7 +144,7 @@ ...@@ -143,7 +144,7 @@
"git", "git",
"status" "status"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git status can_fail_build" "name": "git status can_fail_build"
}, },
{ {
...@@ -151,7 +152,7 @@ ...@@ -151,7 +152,7 @@
"git", "git",
"status" "status"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git status cannot_fail_build" "name": "git status cannot_fail_build"
}, },
{ {
...@@ -160,7 +161,7 @@ ...@@ -160,7 +161,7 @@
"rebase", "rebase",
"origin/master" "origin/master"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "my repo rebase" "name": "my repo rebase"
}, },
{ {
...@@ -168,10 +169,10 @@ ...@@ -168,10 +169,10 @@
"git", "git",
"bundle", "bundle",
"create", "create",
"[CWD]/all.bundle", "[SLAVE_BUILD]/all.bundle",
"--all" "--all"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git bundle" "name": "git bundle"
}, },
{ {
......
recipe_modules/git/example.expected/count-objects_with_bad_output_fails_build.json
View file @ 54e0d263
...@@ -5,10 +5,11 @@ ...@@ -5,10 +5,11 @@
"-u", "-u",
"RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
"--path", "--path",
"[CWD]/src", "[SLAVE_BUILD]/src",
"--url", "--url",
"https://chromium.googlesource.com/chromium/src.git" "https://chromium.googlesource.com/chromium/src.git"
], ],
"cwd": "[SLAVE_BUILD]",
"name": "git setup" "name": "git setup"
}, },
{ {
...@@ -20,7 +21,7 @@ ...@@ -20,7 +21,7 @@
"master", "master",
"--recurse-submodules" "--recurse-submodules"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git fetch" "name": "git fetch"
}, },
{ {
...@@ -30,7 +31,7 @@ ...@@ -30,7 +31,7 @@
"-f", "-f",
"FETCH_HEAD" "FETCH_HEAD"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git checkout" "name": "git checkout"
}, },
{ {
...@@ -39,7 +40,7 @@ ...@@ -39,7 +40,7 @@
"rev-parse", "rev-parse",
"HEAD" "HEAD"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "read revision", "name": "read revision",
"stdout": "/path/to/tmp/", "stdout": "/path/to/tmp/",
"~followup_annotations": [ "~followup_annotations": [
...@@ -54,7 +55,7 @@ ...@@ -54,7 +55,7 @@
"-d", "-d",
"-x" "-x"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git clean" "name": "git clean"
}, },
{ {
...@@ -63,7 +64,7 @@ ...@@ -63,7 +64,7 @@
"submodule", "submodule",
"sync" "sync"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "submodule sync" "name": "submodule sync"
}, },
{ {
...@@ -74,7 +75,7 @@ ...@@ -74,7 +75,7 @@
"--init", "--init",
"--recursive" "--recursive"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "submodule update" "name": "submodule update"
}, },
{ {
...@@ -85,7 +86,7 @@ ...@@ -85,7 +86,7 @@
"count-objects", "count-objects",
"-v" "-v"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "count-objects", "name": "count-objects",
"stdout": "/path/to/tmp/", "stdout": "/path/to/tmp/",
"~followup_annotations": [ "~followup_annotations": [
......
recipe_modules/git/example.expected/curl_trace_file.json
View file @ 54e0d263
...@@ -5,10 +5,11 @@ ...@@ -5,10 +5,11 @@
"-u", "-u",
"RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
"--path", "--path",
"[CWD]/src", "[SLAVE_BUILD]/src",
"--url", "--url",
"https://chromium.googlesource.com/chromium/src.git" "https://chromium.googlesource.com/chromium/src.git"
], ],
"cwd": "[SLAVE_BUILD]",
"name": "git setup" "name": "git setup"
}, },
{ {
...@@ -20,12 +21,12 @@ ...@@ -20,12 +21,12 @@
"refs/foo/bar", "refs/foo/bar",
"--recurse-submodules" "--recurse-submodules"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"env": { "env": {
"GIT_CURL_VERBOSE": "1" "GIT_CURL_VERBOSE": "1"
}, },
"name": "git fetch", "name": "git fetch",
"stderr": "[CWD]/curl_trace.log" "stderr": "[SLAVE_BUILD]/curl_trace.log"
}, },
{ {
"cmd": [ "cmd": [
...@@ -34,7 +35,7 @@ ...@@ -34,7 +35,7 @@
"-f", "-f",
"FETCH_HEAD" "FETCH_HEAD"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git checkout" "name": "git checkout"
}, },
{ {
...@@ -43,7 +44,7 @@ ...@@ -43,7 +44,7 @@
"rev-parse", "rev-parse",
"HEAD" "HEAD"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "read revision", "name": "read revision",
"stdout": "/path/to/tmp/", "stdout": "/path/to/tmp/",
"~followup_annotations": [ "~followup_annotations": [
...@@ -58,7 +59,7 @@ ...@@ -58,7 +59,7 @@
"-d", "-d",
"-x" "-x"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git clean" "name": "git clean"
}, },
{ {
...@@ -67,7 +68,7 @@ ...@@ -67,7 +68,7 @@
"submodule", "submodule",
"sync" "sync"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "submodule sync" "name": "submodule sync"
}, },
{ {
...@@ -78,7 +79,7 @@ ...@@ -78,7 +79,7 @@
"--init", "--init",
"--recursive" "--recursive"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "submodule update" "name": "submodule update"
}, },
{ {
...@@ -89,7 +90,7 @@ ...@@ -89,7 +90,7 @@
"count-objects", "count-objects",
"-v" "-v"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "count-objects", "name": "count-objects",
"stdout": "/path/to/tmp/" "stdout": "/path/to/tmp/"
}, },
...@@ -100,7 +101,7 @@ ...@@ -100,7 +101,7 @@
"--get", "--get",
"remote.origin.url" "remote.origin.url"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git config remote.origin.url", "name": "git config remote.origin.url",
"stdout": "/path/to/tmp/", "stdout": "/path/to/tmp/",
"~followup_annotations": [ "~followup_annotations": [
...@@ -115,7 +116,7 @@ ...@@ -115,7 +116,7 @@
"--format=%at", "--format=%at",
"-s" "-s"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git show", "name": "git show",
"stdout": "/path/to/tmp/" "stdout": "/path/to/tmp/"
}, },
...@@ -126,7 +127,7 @@ ...@@ -126,7 +127,7 @@
"origin", "origin",
"--tags" "--tags"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git fetch tags" "name": "git fetch tags"
}, },
{ {
...@@ -134,7 +135,7 @@ ...@@ -134,7 +135,7 @@
"git", "git",
"status" "status"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git status" "name": "git status"
}, },
{ {
...@@ -142,7 +143,7 @@ ...@@ -142,7 +143,7 @@
"git", "git",
"status" "status"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git status can_fail_build" "name": "git status can_fail_build"
}, },
{ {
...@@ -150,7 +151,7 @@ ...@@ -150,7 +151,7 @@
"git", "git",
"status" "status"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git status cannot_fail_build" "name": "git status cannot_fail_build"
}, },
{ {
...@@ -159,7 +160,7 @@ ...@@ -159,7 +160,7 @@
"rebase", "rebase",
"origin/master" "origin/master"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "my repo rebase" "name": "my repo rebase"
}, },
{ {
...@@ -167,10 +168,10 @@ ...@@ -167,10 +168,10 @@
"git", "git",
"bundle", "bundle",
"create", "create",
"[CWD]/all.bundle", "[SLAVE_BUILD]/all.bundle",
"--all" "--all"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git bundle" "name": "git bundle"
}, },
{ {
......
recipe_modules/git/example.expected/platform_win.json
View file @ 54e0d263
...@@ -12,12 +12,13 @@ ...@@ -12,12 +12,13 @@
"-u", "-u",
"RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py", "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
"--path", "--path",
"[CWD]\\src", "[SLAVE_BUILD]\\src",
"--url", "--url",
"https://chromium.googlesource.com/chromium/src.git", "https://chromium.googlesource.com/chromium/src.git",
"--git_cmd_path", "--git_cmd_path",
"RECIPE_PACKAGE_REPO[depot_tools]\\git.bat" "RECIPE_PACKAGE_REPO[depot_tools]\\git.bat"
], ],
"cwd": "[SLAVE_BUILD]",
"name": "git setup" "name": "git setup"
}, },
{ {
...@@ -29,7 +30,7 @@ ...@@ -29,7 +30,7 @@
"master", "master",
"--recurse-submodules" "--recurse-submodules"
], ],
"cwd": "[CWD]\\src", "cwd": "[SLAVE_BUILD]\\src",
"name": "git fetch" "name": "git fetch"
}, },
{ {
...@@ -39,7 +40,7 @@ ...@@ -39,7 +40,7 @@
"-f", "-f",
"FETCH_HEAD" "FETCH_HEAD"
], ],
"cwd": "[CWD]\\src", "cwd": "[SLAVE_BUILD]\\src",
"name": "git checkout" "name": "git checkout"
}, },
{ {
...@@ -48,7 +49,7 @@ ...@@ -48,7 +49,7 @@
"rev-parse", "rev-parse",
"HEAD" "HEAD"
], ],
"cwd": "[CWD]\\src", "cwd": "[SLAVE_BUILD]\\src",
"name": "read revision", "name": "read revision",
"stdout": "/path/to/tmp/", "stdout": "/path/to/tmp/",
"~followup_annotations": [ "~followup_annotations": [
...@@ -63,7 +64,7 @@ ...@@ -63,7 +64,7 @@
"-d", "-d",
"-x" "-x"
], ],
"cwd": "[CWD]\\src", "cwd": "[SLAVE_BUILD]\\src",
"name": "git clean" "name": "git clean"
}, },
{ {
...@@ -72,7 +73,7 @@ ...@@ -72,7 +73,7 @@
"submodule", "submodule",
"sync" "sync"
], ],
"cwd": "[CWD]\\src", "cwd": "[SLAVE_BUILD]\\src",
"name": "submodule sync" "name": "submodule sync"
}, },
{ {
...@@ -83,7 +84,7 @@ ...@@ -83,7 +84,7 @@
"--init", "--init",
"--recursive" "--recursive"
], ],
"cwd": "[CWD]\\src", "cwd": "[SLAVE_BUILD]\\src",
"name": "submodule update" "name": "submodule update"
}, },
{ {
...@@ -94,7 +95,7 @@ ...@@ -94,7 +95,7 @@
"count-objects", "count-objects",
"-v" "-v"
], ],
"cwd": "[CWD]\\src", "cwd": "[SLAVE_BUILD]\\src",
"name": "count-objects", "name": "count-objects",
"stdout": "/path/to/tmp/" "stdout": "/path/to/tmp/"
}, },
...@@ -105,7 +106,7 @@ ...@@ -105,7 +106,7 @@
"--get", "--get",
"remote.origin.url" "remote.origin.url"
], ],
"cwd": "[CWD]\\src", "cwd": "[SLAVE_BUILD]\\src",
"name": "git config remote.origin.url", "name": "git config remote.origin.url",
"stdout": "/path/to/tmp/", "stdout": "/path/to/tmp/",
"~followup_annotations": [ "~followup_annotations": [
...@@ -120,7 +121,7 @@ ...@@ -120,7 +121,7 @@
"--format=%at", "--format=%at",
"-s" "-s"
], ],
"cwd": "[CWD]\\src", "cwd": "[SLAVE_BUILD]\\src",
"name": "git show", "name": "git show",
"stdout": "/path/to/tmp/" "stdout": "/path/to/tmp/"
}, },
...@@ -131,7 +132,7 @@ ...@@ -131,7 +132,7 @@
"origin", "origin",
"--tags" "--tags"
], ],
"cwd": "[CWD]\\src", "cwd": "[SLAVE_BUILD]\\src",
"name": "git fetch tags" "name": "git fetch tags"
}, },
{ {
...@@ -139,7 +140,7 @@ ...@@ -139,7 +140,7 @@
"RECIPE_PACKAGE_REPO[depot_tools]\\git.bat", "RECIPE_PACKAGE_REPO[depot_tools]\\git.bat",
"status" "status"
], ],
"cwd": "[CWD]\\src", "cwd": "[SLAVE_BUILD]\\src",
"name": "git status" "name": "git status"
}, },
{ {
...@@ -147,7 +148,7 @@ ...@@ -147,7 +148,7 @@
"RECIPE_PACKAGE_REPO[depot_tools]\\git.bat", "RECIPE_PACKAGE_REPO[depot_tools]\\git.bat",
"status" "status"
], ],
"cwd": "[CWD]\\src", "cwd": "[SLAVE_BUILD]\\src",
"name": "git status can_fail_build" "name": "git status can_fail_build"
}, },
{ {
...@@ -155,7 +156,7 @@ ...@@ -155,7 +156,7 @@
"RECIPE_PACKAGE_REPO[depot_tools]\\git.bat", "RECIPE_PACKAGE_REPO[depot_tools]\\git.bat",
"status" "status"
], ],
"cwd": "[CWD]\\src", "cwd": "[SLAVE_BUILD]\\src",
"name": "git status cannot_fail_build" "name": "git status cannot_fail_build"
}, },
{ {
...@@ -164,7 +165,7 @@ ...@@ -164,7 +165,7 @@
"rebase", "rebase",
"origin/master" "origin/master"
], ],
"cwd": "[CWD]\\src", "cwd": "[SLAVE_BUILD]\\src",
"name": "my repo rebase" "name": "my repo rebase"
}, },
{ {
...@@ -172,10 +173,10 @@ ...@@ -172,10 +173,10 @@
"RECIPE_PACKAGE_REPO[depot_tools]\\git.bat", "RECIPE_PACKAGE_REPO[depot_tools]\\git.bat",
"bundle", "bundle",
"create", "create",
"[CWD]\\all.bundle", "[SLAVE_BUILD]\\all.bundle",
"--all" "--all"
], ],
"cwd": "[CWD]\\src", "cwd": "[SLAVE_BUILD]\\src",
"name": "git bundle" "name": "git bundle"
}, },
{ {
......
recipe_modules/git/example.expected/rebase_failed.json
View file @ 54e0d263
...@@ -5,10 +5,11 @@ ...@@ -5,10 +5,11 @@
"-u", "-u",
"RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
"--path", "--path",
"[CWD]/src", "[SLAVE_BUILD]/src",
"--url", "--url",
"https://chromium.googlesource.com/chromium/src.git" "https://chromium.googlesource.com/chromium/src.git"
], ],
"cwd": "[SLAVE_BUILD]",
"name": "git setup" "name": "git setup"
}, },
{ {
...@@ -20,7 +21,7 @@ ...@@ -20,7 +21,7 @@
"master", "master",
"--recurse-submodules" "--recurse-submodules"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git fetch" "name": "git fetch"
}, },
{ {
...@@ -30,7 +31,7 @@ ...@@ -30,7 +31,7 @@
"-f", "-f",
"FETCH_HEAD" "FETCH_HEAD"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git checkout" "name": "git checkout"
}, },
{ {
...@@ -39,7 +40,7 @@ ...@@ -39,7 +40,7 @@
"rev-parse", "rev-parse",
"HEAD" "HEAD"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "read revision", "name": "read revision",
"stdout": "/path/to/tmp/", "stdout": "/path/to/tmp/",
"~followup_annotations": [ "~followup_annotations": [
...@@ -54,7 +55,7 @@ ...@@ -54,7 +55,7 @@
"-d", "-d",
"-x" "-x"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git clean" "name": "git clean"
}, },
{ {
...@@ -63,7 +64,7 @@ ...@@ -63,7 +64,7 @@
"submodule", "submodule",
"sync" "sync"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "submodule sync" "name": "submodule sync"
}, },
{ {
...@@ -74,7 +75,7 @@ ...@@ -74,7 +75,7 @@
"--init", "--init",
"--recursive" "--recursive"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "submodule update" "name": "submodule update"
}, },
{ {
...@@ -85,7 +86,7 @@ ...@@ -85,7 +86,7 @@
"count-objects", "count-objects",
"-v" "-v"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "count-objects", "name": "count-objects",
"stdout": "/path/to/tmp/" "stdout": "/path/to/tmp/"
}, },
...@@ -96,7 +97,7 @@ ...@@ -96,7 +97,7 @@
"--get", "--get",
"remote.origin.url" "remote.origin.url"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git config remote.origin.url", "name": "git config remote.origin.url",
"stdout": "/path/to/tmp/", "stdout": "/path/to/tmp/",
"~followup_annotations": [ "~followup_annotations": [
...@@ -111,7 +112,7 @@ ...@@ -111,7 +112,7 @@
"--format=%at", "--format=%at",
"-s" "-s"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git show", "name": "git show",
"stdout": "/path/to/tmp/" "stdout": "/path/to/tmp/"
}, },
...@@ -122,7 +123,7 @@ ...@@ -122,7 +123,7 @@
"origin", "origin",
"--tags" "--tags"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git fetch tags" "name": "git fetch tags"
}, },
{ {
...@@ -130,7 +131,7 @@ ...@@ -130,7 +131,7 @@
"git", "git",
"status" "status"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git status" "name": "git status"
}, },
{ {
...@@ -138,7 +139,7 @@ ...@@ -138,7 +139,7 @@
"git", "git",
"status" "status"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git status can_fail_build" "name": "git status can_fail_build"
}, },
{ {
...@@ -146,7 +147,7 @@ ...@@ -146,7 +147,7 @@
"git", "git",
"status" "status"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git status cannot_fail_build" "name": "git status cannot_fail_build"
}, },
{ {
...@@ -155,7 +156,7 @@ ...@@ -155,7 +156,7 @@
"rebase", "rebase",
"origin/master" "origin/master"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "my repo rebase", "name": "my repo rebase",
"~followup_annotations": [ "~followup_annotations": [
"step returned non-zero exit code: 1", "step returned non-zero exit code: 1",
...@@ -168,7 +169,7 @@ ...@@ -168,7 +169,7 @@
"rebase", "rebase",
"--abort" "--abort"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "my repo rebase abort" "name": "my repo rebase abort"
}, },
{ {
......
recipe_modules/git/example.expected/remote_not_origin.json
View file @ 54e0d263
...@@ -5,12 +5,13 @@ ...@@ -5,12 +5,13 @@
"-u", "-u",
"RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
"--path", "--path",
"[CWD]/src", "[SLAVE_BUILD]/src",
"--url", "--url",
"https://chromium.googlesource.com/chromium/src.git", "https://chromium.googlesource.com/chromium/src.git",
"--remote", "--remote",
"not_origin" "not_origin"
], ],
"cwd": "[SLAVE_BUILD]",
"name": "git setup" "name": "git setup"
}, },
{ {
...@@ -22,7 +23,7 @@ ...@@ -22,7 +23,7 @@
"master", "master",
"--recurse-submodules" "--recurse-submodules"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git fetch" "name": "git fetch"
}, },
{ {
...@@ -32,7 +33,7 @@ ...@@ -32,7 +33,7 @@
"-f", "-f",
"FETCH_HEAD" "FETCH_HEAD"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git checkout" "name": "git checkout"
}, },
{ {
...@@ -41,7 +42,7 @@ ...@@ -41,7 +42,7 @@
"rev-parse", "rev-parse",
"HEAD" "HEAD"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "read revision", "name": "read revision",
"stdout": "/path/to/tmp/", "stdout": "/path/to/tmp/",
"~followup_annotations": [ "~followup_annotations": [
...@@ -56,7 +57,7 @@ ...@@ -56,7 +57,7 @@
"-d", "-d",
"-x" "-x"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git clean" "name": "git clean"
}, },
{ {
...@@ -65,7 +66,7 @@ ...@@ -65,7 +66,7 @@
"submodule", "submodule",
"sync" "sync"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "submodule sync" "name": "submodule sync"
}, },
{ {
...@@ -76,7 +77,7 @@ ...@@ -76,7 +77,7 @@
"--init", "--init",
"--recursive" "--recursive"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "submodule update" "name": "submodule update"
}, },
{ {
...@@ -87,7 +88,7 @@ ...@@ -87,7 +88,7 @@
"count-objects", "count-objects",
"-v" "-v"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "count-objects", "name": "count-objects",
"stdout": "/path/to/tmp/" "stdout": "/path/to/tmp/"
}, },
...@@ -98,7 +99,7 @@ ...@@ -98,7 +99,7 @@
"--get", "--get",
"remote.origin.url" "remote.origin.url"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git config remote.origin.url", "name": "git config remote.origin.url",
"stdout": "/path/to/tmp/", "stdout": "/path/to/tmp/",
"~followup_annotations": [ "~followup_annotations": [
...@@ -113,7 +114,7 @@ ...@@ -113,7 +114,7 @@
"--format=%at", "--format=%at",
"-s" "-s"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git show", "name": "git show",
"stdout": "/path/to/tmp/" "stdout": "/path/to/tmp/"
}, },
...@@ -124,7 +125,7 @@ ...@@ -124,7 +125,7 @@
"not_origin", "not_origin",
"--tags" "--tags"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git fetch tags" "name": "git fetch tags"
}, },
{ {
...@@ -132,7 +133,7 @@ ...@@ -132,7 +133,7 @@
"git", "git",
"status" "status"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git status" "name": "git status"
}, },
{ {
...@@ -140,7 +141,7 @@ ...@@ -140,7 +141,7 @@
"git", "git",
"status" "status"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git status can_fail_build" "name": "git status can_fail_build"
}, },
{ {
...@@ -148,7 +149,7 @@ ...@@ -148,7 +149,7 @@
"git", "git",
"status" "status"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git status cannot_fail_build" "name": "git status cannot_fail_build"
}, },
{ {
...@@ -157,7 +158,7 @@ ...@@ -157,7 +158,7 @@
"rebase", "rebase",
"not_origin/master" "not_origin/master"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "my repo rebase" "name": "my repo rebase"
}, },
{ {
...@@ -165,10 +166,10 @@ ...@@ -165,10 +166,10 @@
"git", "git",
"bundle", "bundle",
"create", "create",
"[CWD]/all.bundle", "[SLAVE_BUILD]/all.bundle",
"--all" "--all"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git bundle" "name": "git bundle"
}, },
{ {
......
recipe_modules/git/example.expected/set_got_revision.json
View file @ 54e0d263
...@@ -5,10 +5,11 @@ ...@@ -5,10 +5,11 @@
"-u", "-u",
"RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
"--path", "--path",
"[CWD]/src", "[SLAVE_BUILD]/src",
"--url", "--url",
"https://chromium.googlesource.com/chromium/src.git" "https://chromium.googlesource.com/chromium/src.git"
], ],
"cwd": "[SLAVE_BUILD]",
"name": "git setup" "name": "git setup"
}, },
{ {
...@@ -20,7 +21,7 @@ ...@@ -20,7 +21,7 @@
"master", "master",
"--recurse-submodules" "--recurse-submodules"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git fetch" "name": "git fetch"
}, },
{ {
...@@ -30,7 +31,7 @@ ...@@ -30,7 +31,7 @@
"-f", "-f",
"FETCH_HEAD" "FETCH_HEAD"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git checkout" "name": "git checkout"
}, },
{ {
...@@ -39,7 +40,7 @@ ...@@ -39,7 +40,7 @@
"rev-parse", "rev-parse",
"HEAD" "HEAD"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "read revision", "name": "read revision",
"stdout": "/path/to/tmp/", "stdout": "/path/to/tmp/",
"~followup_annotations": [ "~followup_annotations": [
...@@ -55,7 +56,7 @@ ...@@ -55,7 +56,7 @@
"-d", "-d",
"-x" "-x"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git clean" "name": "git clean"
}, },
{ {
...@@ -64,7 +65,7 @@ ...@@ -64,7 +65,7 @@
"submodule", "submodule",
"sync" "sync"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "submodule sync" "name": "submodule sync"
}, },
{ {
...@@ -75,7 +76,7 @@ ...@@ -75,7 +76,7 @@
"--init", "--init",
"--recursive" "--recursive"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "submodule update" "name": "submodule update"
}, },
{ {
...@@ -86,7 +87,7 @@ ...@@ -86,7 +87,7 @@
"count-objects", "count-objects",
"-v" "-v"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "count-objects", "name": "count-objects",
"stdout": "/path/to/tmp/" "stdout": "/path/to/tmp/"
}, },
...@@ -97,7 +98,7 @@ ...@@ -97,7 +98,7 @@
"--get", "--get",
"remote.origin.url" "remote.origin.url"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git config remote.origin.url", "name": "git config remote.origin.url",
"stdout": "/path/to/tmp/", "stdout": "/path/to/tmp/",
"~followup_annotations": [ "~followup_annotations": [
...@@ -112,7 +113,7 @@ ...@@ -112,7 +113,7 @@
"--format=%at", "--format=%at",
"-s" "-s"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git show", "name": "git show",
"stdout": "/path/to/tmp/" "stdout": "/path/to/tmp/"
}, },
...@@ -123,7 +124,7 @@ ...@@ -123,7 +124,7 @@
"origin", "origin",
"--tags" "--tags"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git fetch tags" "name": "git fetch tags"
}, },
{ {
...@@ -131,7 +132,7 @@ ...@@ -131,7 +132,7 @@
"git", "git",
"status" "status"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git status" "name": "git status"
}, },
{ {
...@@ -139,7 +140,7 @@ ...@@ -139,7 +140,7 @@
"git", "git",
"status" "status"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git status can_fail_build" "name": "git status can_fail_build"
}, },
{ {
...@@ -147,7 +148,7 @@ ...@@ -147,7 +148,7 @@
"git", "git",
"status" "status"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git status cannot_fail_build" "name": "git status cannot_fail_build"
}, },
{ {
...@@ -156,7 +157,7 @@ ...@@ -156,7 +157,7 @@
"rebase", "rebase",
"origin/master" "origin/master"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "my repo rebase" "name": "my repo rebase"
}, },
{ {
...@@ -164,10 +165,10 @@ ...@@ -164,10 +165,10 @@
"git", "git",
"bundle", "bundle",
"create", "create",
"[CWD]/all.bundle", "[SLAVE_BUILD]/all.bundle",
"--all" "--all"
], ],
"cwd": "[CWD]/src", "cwd": "[SLAVE_BUILD]/src",
"name": "git bundle" "name": "git bundle"
}, },
{ {
......
recipe_modules/git/example.py
View file @ 54e0d263
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
DEPS = [ DEPS = [
'git', 'git',
'infra_paths',
'recipe_engine/path', 'recipe_engine/path',
'recipe_engine/platform', 'recipe_engine/platform',
'recipe_engine/properties', 'recipe_engine/properties',
...@@ -20,7 +19,7 @@ def RunSteps(api): ...@@ -20,7 +19,7 @@ def RunSteps(api):
# useful for debugging git access issues that are reproducible only on bots. # useful for debugging git access issues that are reproducible only on bots.
curl_trace_file = None curl_trace_file = None
if api.properties.get('use_curl_trace'): 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_force = api.properties.get('submodule_update_force', False)
submodule_update_recursive = api.properties.get('submodule_update_recursive', submodule_update_recursive = api.properties.get('submodule_update_recursive',
...@@ -81,7 +80,7 @@ def RunSteps(api): ...@@ -81,7 +80,7 @@ def RunSteps(api):
# Bundle the repository. # Bundle the repository.
api.git.bundle_create( api.git.bundle_create(
api.infra_paths['slave_build'].join('all.bundle')) api.path['slave_build'].join('all.bundle'))
def GenTests(api): def GenTests(api):
......
recipe_modules/infra_paths/__init__.py deleted 100644 → 0
View file @ c767e3f2
DEPS = [
'recipe_engine/path',
'recipe_engine/platform',
'recipe_engine/properties',
]
recipe_modules/infra_paths/api.py deleted 100644 → 0
View file @ c767e3f2
# 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
from recipe_engine.config_types import Path, NamedBasePath
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')
if self._test_data.enabled:
for path in self._test_data.get('exists', []):
assert isinstance(path.base, NamedBasePath)
self.m.path.mock_add_paths(self[path.base.name].join(*path.pieces))
def __getitem__(self, name):
self._lazy_set_config()
return self.c.paths[name]
recipe_modules/infra_paths/config.py deleted 100644 → 0
View file @ c767e3f2
# 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')
recipe_modules/infra_paths/example.expected/linux.json deleted 100644 → 0
View file @ c767e3f2
[
{
"cmd": [],
"cwd": "[CWD]",
"name": "step"
},
{
"cmd": [],
"name": "path exists"
},
{
"name": "$result",
"recipe_result": null,
"status_code": 0
}
]
\ No newline at end of file
recipe_modules/infra_paths/example.expected/linux_kitchen.json deleted 100644 → 0
View file @ c767e3f2
[
{
"cmd": [],
"cwd": "[CWD]",
"name": "step"
},
{
"name": "$result",
"recipe_result": null,
"status_code": 0
}
]
\ No newline at end of file
recipe_modules/infra_paths/example.expected/mac.json deleted 100644 → 0
View file @ c767e3f2
[
{
"cmd": [],
"cwd": "[CWD]",
"name": "step"
},
{
"cmd": [],
"name": "path exists"
},
{
"name": "$result",
"recipe_result": null,
"status_code": 0
}
]
\ No newline at end of file
recipe_modules/infra_paths/example.expected/mac_kitchen.json deleted 100644 → 0
View file @ c767e3f2
[
{
"cmd": [],
"cwd": "[CWD]",
"name": "step"
},
{
"name": "$result",
"recipe_result": null,
"status_code": 0
}
]
\ No newline at end of file
recipe_modules/infra_paths/example.expected/win.json deleted 100644 → 0
View file @ c767e3f2
[
{
"cmd": [],
"cwd": "[CWD]",
"name": "step"
},
{
"cmd": [],
"name": "path exists"
},
{
"name": "$result",
"recipe_result": null,
"status_code": 0
}
]
\ No newline at end of file
recipe_modules/infra_paths/example.expected/win_kitchen.json deleted 100644 → 0
View file @ c767e3f2
[
{
"cmd": [],
"cwd": "[CWD]",
"name": "step"
},
{
"name": "$result",
"recipe_result": null,
"status_code": 0
}
]
\ No newline at end of file
recipe_modules/infra_paths/example.py deleted 100644 → 0
View file @ c767e3f2
# 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/path',
'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'])
if api.path.exists(api.infra_paths['slave_build'].join('foo.txt')):
api.step('path exists', [])
def GenTests(api):
for platform in ('linux', 'win', 'mac'):
yield (api.test(platform) +
api.platform.name(platform) +
api.infra_paths.exists(
api.infra_paths['slave_build'].join('foo.txt')))
yield (api.test('%s_kitchen' % platform) +
api.platform.name(platform) +
api.properties(path_config='kitchen'))
recipe_modules/presubmit/example.expected/basic.json
View file @ 54e0d263
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
"-u", "-u",
"RECIPE_PACKAGE_REPO[depot_tools]/presubmit_support.py" "RECIPE_PACKAGE_REPO[depot_tools]/presubmit_support.py"
], ],
"cwd": "[SLAVE_BUILD]",
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
......
recipe_modules/rietveld/__init__.py
View file @ 54e0d263
DEPS = [ DEPS = [
'infra_paths',
'recipe_engine/path', 'recipe_engine/path',
'recipe_engine/properties', 'recipe_engine/properties',
'recipe_engine/python', 'recipe_engine/python',
......
recipe_modules/rietveld/api.py
View file @ 54e0d263
...@@ -67,22 +67,22 @@ class RietveldApi(recipe_api.RecipeApi): ...@@ -67,22 +67,22 @@ class RietveldApi(recipe_api.RecipeApi):
if authentication == 'oauth2': if authentication == 'oauth2':
step_result = self.m.python( step_result = self.m.python(
'apply_issue', '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), '-r', self.m.path['checkout'].join(*root_pieces),
'-i', issue_number, '-i', issue_number,
'-p', self.m.properties['patchset'], '-p', self.m.properties['patchset'],
'-s', rietveld_url, '-s', rietveld_url,
'-E', self.m.infra_paths['build'].join( '-E', self.m.path['build'].join('site_config',
'site_config', '.rietveld_client_email'), '.rietveld_client_email'),
'-k', self.m.infra_paths['build'].join( '-k', self.m.path['build'].join('site_config',
'site_config', '.rietveld_secret_key') '.rietveld_secret_key')
], ],
) )
else: else:
step_result = self.m.python( step_result = self.m.python(
'apply_issue', '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), '-r', self.m.path['checkout'].join(*root_pieces),
'-i', issue_number, '-i', issue_number,
'-p', self.m.properties['patchset'], '-p', self.m.properties['patchset'],
......
recipe_modules/rietveld/example.expected/basic.json
View file @ 54e0d263
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
"cmd": [ "cmd": [
"python", "python",
"-u", "-u",
"[ROOT]/b/depot_tools/apply_issue.py", "[DEPOT_TOOLS]/apply_issue.py",
"-r", "-r",
"[CWD]/foo/bar", "[SLAVE_BUILD]/foo/bar",
"-i", "-i",
"1", "1",
"-p", "-p",
...@@ -13,10 +13,11 @@ ...@@ -13,10 +13,11 @@
"-s", "-s",
"http://review_tool.url", "http://review_tool.url",
"-E", "-E",
"[ROOT]/b/build/site_config/.rietveld_client_email", "[BUILD]/site_config/.rietveld_client_email",
"-k", "-k",
"[ROOT]/b/build/site_config/.rietveld_secret_key" "[BUILD]/site_config/.rietveld_secret_key"
], ],
"cwd": "[SLAVE_BUILD]",
"name": "apply_issue", "name": "apply_issue",
"~followup_annotations": [ "~followup_annotations": [
"@@@STEP_LINK@Applied issue 1@http://review_tool.url/1@@@" "@@@STEP_LINK@Applied issue 1@http://review_tool.url/1@@@"
......
recipe_modules/rietveld/example.py
View file @ 54e0d263
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
# found in the LICENSE file. # found in the LICENSE file.
DEPS = [ DEPS = [
'infra_paths',
'recipe_engine/path', 'recipe_engine/path',
'recipe_engine/properties', 'recipe_engine/properties',
'recipe_engine/step', 'recipe_engine/step',
...@@ -11,7 +10,7 @@ DEPS = [ ...@@ -11,7 +10,7 @@ DEPS = [
] ]
def RunSteps(api): 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.apply_issue('foo', 'bar', authentication='oauth2')
api.rietveld.calculate_issue_root({'project': ['']}) api.rietveld.calculate_issue_root({'project': ['']})
......
recipe_modules/tryserver/__init__.py
View file @ 54e0d263
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
DEPS = [ DEPS = [
'git', 'git',
'infra_paths',
'recipe_engine/json', 'recipe_engine/json',
'recipe_engine/path', 'recipe_engine/path',
'recipe_engine/platform', 'recipe_engine/platform',
......
recipe_modules/tryserver/api.py
View file @ 54e0d263
...@@ -100,8 +100,7 @@ class TryserverApi(recipe_api.RecipeApi): ...@@ -100,8 +100,7 @@ class TryserverApi(recipe_api.RecipeApi):
patch_ref = self.m.properties['patch_ref'] patch_ref = self.m.properties['patch_ref']
patch_dir = self.m.path.mkdtemp('patch') patch_dir = self.m.path.mkdtemp('patch')
git_setup_py = self.m.infra_paths['build'].join( git_setup_py = self.m.path['build'].join('scripts', 'slave', 'git_setup.py')
'scripts', 'slave', 'git_setup.py')
git_setup_args = ['--path', patch_dir, '--url', patch_repo_url] git_setup_args = ['--path', patch_dir, '--url', patch_repo_url]
patch_path = patch_dir.join('patch.diff') patch_path = patch_dir.join('patch.diff')
......
recipe_modules/tryserver/example.expected/with_git_patch.json
View file @ 54e0d263
...@@ -3,12 +3,13 @@ ...@@ -3,12 +3,13 @@
"cmd": [ "cmd": [
"python", "python",
"-u", "-u",
"[ROOT]/b/build/scripts/slave/git_setup.py", "[BUILD]/scripts/slave/git_setup.py",
"--path", "--path",
"[TMP]/patch_tmp_1", "[TMP_BASE]/patch_tmp_1",
"--url", "--url",
"http://patch.url/" "http://patch.url/"
], ],
"cwd": "[SLAVE_BUILD]",
"name": "patch git setup" "name": "patch git setup"
}, },
{ {
...@@ -18,7 +19,7 @@ ...@@ -18,7 +19,7 @@
"origin", "origin",
"johndoe#123.diff" "johndoe#123.diff"
], ],
"cwd": "[TMP]/patch_tmp_1", "cwd": "[TMP_BASE]/patch_tmp_1",
"name": "patch fetch" "name": "patch fetch"
}, },
{ {
...@@ -29,7 +30,7 @@ ...@@ -29,7 +30,7 @@
"-d", "-d",
"-x" "-x"
], ],
"cwd": "[TMP]/patch_tmp_1", "cwd": "[TMP_BASE]/patch_tmp_1",
"name": "patch clean" "name": "patch clean"
}, },
{ {
...@@ -39,30 +40,32 @@ ...@@ -39,30 +40,32 @@
"-f", "-f",
"FETCH_HEAD" "FETCH_HEAD"
], ],
"cwd": "[TMP]/patch_tmp_1", "cwd": "[TMP_BASE]/patch_tmp_1",
"name": "patch git checkout" "name": "patch git checkout"
}, },
{ {
"cmd": [ "cmd": [
"patch", "patch",
"--dir", "--dir",
"[CWD]", "[SLAVE_BUILD]",
"--force", "--force",
"--forward", "--forward",
"--remove-empty-files", "--remove-empty-files",
"--strip", "--strip",
"0", "0",
"--input", "--input",
"[TMP]/patch_tmp_1/patch.diff" "[TMP_BASE]/patch_tmp_1/patch.diff"
], ],
"cwd": "[SLAVE_BUILD]",
"name": "apply patch" "name": "apply patch"
}, },
{ {
"cmd": [ "cmd": [
"rm", "rm",
"-rf", "-rf",
"[TMP]/patch_tmp_1" "[TMP_BASE]/patch_tmp_1"
], ],
"cwd": "[SLAVE_BUILD]",
"name": "remove patch" "name": "remove patch"
}, },
{ {
...@@ -72,7 +75,7 @@ ...@@ -72,7 +75,7 @@
"--cached", "--cached",
"--name-only" "--name-only"
], ],
"cwd": "[CWD]/v8", "cwd": "[SLAVE_BUILD]/v8",
"name": "git diff to analyze patch", "name": "git diff to analyze patch",
"stdout": "/path/to/tmp/", "stdout": "/path/to/tmp/",
"~followup_annotations": [ "~followup_annotations": [
...@@ -88,6 +91,7 @@ ...@@ -88,6 +91,7 @@
"-u", "-u",
"import sys; sys.exit(1)" "import sys; sys.exit(1)"
], ],
"cwd": "[SLAVE_BUILD]",
"name": "fail", "name": "fail",
"~followup_annotations": [ "~followup_annotations": [
"step returned non-zero exit code: 1", "step returned non-zero exit code: 1",
......
recipe_modules/tryserver/example.expected/with_rietveld_patch.json
View file @ 54e0d263
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
"cmd": [ "cmd": [
"python", "python",
"-u", "-u",
"[ROOT]/b/depot_tools/apply_issue.py", "[DEPOT_TOOLS]/apply_issue.py",
"-r", "-r",
"[CWD]", "[SLAVE_BUILD]",
"-i", "-i",
"12853011", "12853011",
"-p", "-p",
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
"https://codereview.chromium.org", "https://codereview.chromium.org",
"--no-auth" "--no-auth"
], ],
"cwd": "[SLAVE_BUILD]",
"name": "apply_issue", "name": "apply_issue",
"~followup_annotations": [ "~followup_annotations": [
"@@@STEP_LINK@Applied issue 12853011@https://codereview.chromium.org/12853011@@@" "@@@STEP_LINK@Applied issue 12853011@https://codereview.chromium.org/12853011@@@"
...@@ -26,7 +27,7 @@ ...@@ -26,7 +27,7 @@
"--cached", "--cached",
"--name-only" "--name-only"
], ],
"cwd": "[CWD]", "cwd": "[SLAVE_BUILD]",
"name": "git diff to analyze patch", "name": "git diff to analyze patch",
"stdout": "/path/to/tmp/", "stdout": "/path/to/tmp/",
"~followup_annotations": [ "~followup_annotations": [
...@@ -42,6 +43,7 @@ ...@@ -42,6 +43,7 @@
"-u", "-u",
"import sys; sys.exit(1)" "import sys; sys.exit(1)"
], ],
"cwd": "[SLAVE_BUILD]",
"name": "fail", "name": "fail",
"~followup_annotations": [ "~followup_annotations": [
"step returned non-zero exit code: 1", "step returned non-zero exit code: 1",
......
recipe_modules/tryserver/example.expected/with_svn_patch.json
View file @ 54e0d263
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
"svn://checkout.url", "svn://checkout.url",
"/path/to/tmp/diff" "/path/to/tmp/diff"
], ],
"cwd": "[SLAVE_BUILD]",
"name": "download patch", "name": "download patch",
"~followup_annotations": [ "~followup_annotations": [
"@@@STEP_LOG_LINE@patch.diff@fake patch.diff content (line 1)@@@", "@@@STEP_LOG_LINE@patch.diff@fake patch.diff content (line 1)@@@",
...@@ -19,13 +20,14 @@ ...@@ -19,13 +20,14 @@
"cmd": [ "cmd": [
"patch", "patch",
"--dir", "--dir",
"[CWD]", "[SLAVE_BUILD]",
"--force", "--force",
"--forward", "--forward",
"--remove-empty-files", "--remove-empty-files",
"--strip", "--strip",
"0" "0"
], ],
"cwd": "[SLAVE_BUILD]",
"name": "apply patch", "name": "apply patch",
"stdin": "fake patch.diff content (line 1)\nfake patch.diff content (line 2)\n" "stdin": "fake patch.diff content (line 1)\nfake patch.diff content (line 2)\n"
}, },
...@@ -36,7 +38,7 @@ ...@@ -36,7 +38,7 @@
"--cached", "--cached",
"--name-only" "--name-only"
], ],
"cwd": "[CWD]", "cwd": "[SLAVE_BUILD]",
"name": "git diff to analyze patch", "name": "git diff to analyze patch",
"stdout": "/path/to/tmp/", "stdout": "/path/to/tmp/",
"~followup_annotations": [ "~followup_annotations": [
...@@ -52,6 +54,7 @@ ...@@ -52,6 +54,7 @@
"-u", "-u",
"import sys; sys.exit(1)" "import sys; sys.exit(1)"
], ],
"cwd": "[SLAVE_BUILD]",
"name": "fail", "name": "fail",
"~followup_annotations": [ "~followup_annotations": [
"step returned non-zero exit code: 1", "step returned non-zero exit code: 1",
......
recipe_modules/tryserver/example.expected/with_wrong_patch.json
View file @ 54e0d263
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
"--cached", "--cached",
"--name-only" "--name-only"
], ],
"cwd": "[CWD]", "cwd": "[SLAVE_BUILD]",
"name": "git diff to analyze patch", "name": "git diff to analyze patch",
"stdout": "/path/to/tmp/", "stdout": "/path/to/tmp/",
"~followup_annotations": [ "~followup_annotations": [
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
"-u", "-u",
"import sys; sys.exit(1)" "import sys; sys.exit(1)"
], ],
"cwd": "[SLAVE_BUILD]",
"name": "fail", "name": "fail",
"~followup_annotations": [ "~followup_annotations": [
"step returned non-zero exit code: 1", "step returned non-zero exit code: 1",
......
recipe_modules/tryserver/example.py
View file @ 54e0d263
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
# found in the LICENSE file. # found in the LICENSE file.
DEPS = [ DEPS = [
'infra_paths',
'recipe_engine/path', 'recipe_engine/path',
'recipe_engine/platform', 'recipe_engine/platform',
'recipe_engine/properties', 'recipe_engine/properties',
...@@ -13,7 +12,7 @@ DEPS = [ ...@@ -13,7 +12,7 @@ DEPS = [
def RunSteps(api): 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.maybe_apply_issue()
api.tryserver.get_files_affected_by_patch() api.tryserver.get_files_affected_by_patch()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment