Skip to content

C
Chromium_Depot_tools
Commit fbf01c54 authored by Nodir Turakulov's avatar Nodir Turakulov Committed by Commit Bot
Browse files
Options

remove slave_build path 

slave_build path, defined by infra_paths module, is unnecessarily tied
to our buildbot setup which we are trying to deprecate in favor of LUCI.
In practice it is always == start_dir and that's what we want in LUCI too.

Update all code that uses slave_build path to use start_dir instead.

R=iannucci@chromium.org, martiniss@chromium.org
BUG=662586

Change-Id: Id52aa535d6a4f52670d581bf56aab65f670b1861
Reviewed-on: https://chromium-review.googlesource.com/412075
Commit-Queue: Nodir Turakulov <nodir@chromium.org>
Reviewed-by: 's avatarStephen Martinis <martiniss@chromium.org>
parent 52185b37
Hide whitespace changes
Inline Side-by-side
Showing with 490 additions and 486 deletions
recipe_modules/bot_update/api.py
View file @ fbf01c54
......@@ -301,7 +301,7 @@ class BotUpdateApi(recipe_api.RecipeApi):
# first solution.
if step_result.json.output['did_run']:
co_root = step_result.json.output['root']
cwd = kwargs.get('cwd', self.m.path['slave_build'])
cwd = kwargs.get('cwd', self.m.path['start_dir'])
if 'checkout' not in self.m.path:
self.m.path['checkout'] = cwd.join(*co_root.split(self.m.path.sep))
......
recipe_modules/cipd/api.py
View file @ fbf01c54
......@@ -51,7 +51,7 @@ class CIPDApi(recipe_api.RecipeApi):
script=self.resource('bootstrap.py'),
args=[
'--platform', self.platform_suffix(),
'--dest-directory', self.m.path['slave_build'].join('cipd'),
'--dest-directory', self.m.path['start_dir'].join('cipd'),
'--json-output', self.m.json.output(),
] +
(['--version', version] if version else []),
......
recipe_modules/cipd/example.expected/basic.json
View file @ fbf01c54
......@@ -7,7 +7,7 @@
"--platform",
"linux-amd64",
"--dest-directory",
"[SLAVE_BUILD]/cipd",
"[START_DIR]/cipd",
"--json-output",
"/path/to/tmp/json"
],
......@@ -15,7 +15,7 @@
"~followup_annotations": [
"@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"executable\": \"[START_DIR]/cipd/cipd\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
......@@ -29,7 +29,7 @@
"--platform",
"linux-amd64",
"--dest-directory",
"[SLAVE_BUILD]/cipd",
"[START_DIR]/cipd",
"--json-output",
"/path/to/tmp/json",
"--version",
......@@ -39,7 +39,7 @@
"~followup_annotations": [
"@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"executable\": \"[START_DIR]/cipd/cipd\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
......@@ -47,10 +47,10 @@
},
{
"cmd": [
"[SLAVE_BUILD]/cipd/cipd",
"[START_DIR]/cipd/cipd",
"ensure",
"--root",
"[SLAVE_BUILD]/packages",
"[START_DIR]/packages",
"--list",
"public/package/linux-amd64 7f751b2237df2fdf3c1405be00590fefffbaea2d",
"--json-output",
......@@ -73,7 +73,7 @@
},
{
"cmd": [
"[SLAVE_BUILD]/cipd/cipd",
"[START_DIR]/cipd/cipd",
"search",
"public/package/linux-amd64",
"--tag",
......@@ -98,7 +98,7 @@
},
{
"cmd": [
"[SLAVE_BUILD]/cipd/cipd",
"[START_DIR]/cipd/cipd",
"describe",
"public/package/linux-amd64",
"--version",
......@@ -149,10 +149,10 @@
},
{
"cmd": [
"[SLAVE_BUILD]/cipd/cipd",
"[START_DIR]/cipd/cipd",
"ensure",
"--root",
"[SLAVE_BUILD]/packages",
"[START_DIR]/packages",
"--list",
"private/package/linux-amd64 latest\npublic/package/linux-amd64 7f751b2237df2fdf3c1405be00590fefffbaea2d",
"--json-output",
......@@ -179,7 +179,7 @@
},
{
"cmd": [
"[SLAVE_BUILD]/cipd/cipd",
"[START_DIR]/cipd/cipd",
"search",
"private/package/linux-amd64",
"--tag",
......@@ -204,7 +204,7 @@
},
{
"cmd": [
"[SLAVE_BUILD]/cipd/cipd",
"[START_DIR]/cipd/cipd",
"describe",
"private/package/linux-amd64",
"--version",
......@@ -250,7 +250,7 @@
},
{
"cmd": [
"[SLAVE_BUILD]/cipd/cipd",
"[START_DIR]/cipd/cipd",
"pkg-build",
"--in",
"fake-input-dir",
......@@ -274,7 +274,7 @@
},
{
"cmd": [
"[SLAVE_BUILD]/cipd/cipd",
"[START_DIR]/cipd/cipd",
"pkg-build",
"--in",
"fake-input-dir",
......@@ -300,7 +300,7 @@
},
{
"cmd": [
"[SLAVE_BUILD]/cipd/cipd",
"[START_DIR]/cipd/cipd",
"pkg-register",
"fake-package-path",
"--json-output",
......@@ -329,10 +329,10 @@
},
{
"cmd": [
"[SLAVE_BUILD]/cipd/cipd",
"[START_DIR]/cipd/cipd",
"create",
"--pkg-def",
"[SLAVE_BUILD]/fake-package.yaml",
"[START_DIR]/fake-package.yaml",
"--json-output",
"/path/to/tmp/json",
"--service-account-json",
......@@ -354,7 +354,7 @@
},
{
"cmd": [
"[SLAVE_BUILD]/cipd/cipd",
"[START_DIR]/cipd/cipd",
"set-tag",
"fake-package",
"--version",
......@@ -384,7 +384,7 @@
},
{
"cmd": [
"[SLAVE_BUILD]/cipd/cipd",
"[START_DIR]/cipd/cipd",
"set-ref",
"fake-package",
"--version",
......@@ -414,7 +414,7 @@
},
{
"cmd": [
"[SLAVE_BUILD]/cipd/cipd",
"[START_DIR]/cipd/cipd",
"search",
"fake-package/linux-amd64",
"--tag",
......
recipe_modules/cipd/example.expected/describe-failed.json
View file @ fbf01c54
......@@ -7,7 +7,7 @@
"--platform",
"linux-amd64",
"--dest-directory",
"[SLAVE_BUILD]/cipd",
"[START_DIR]/cipd",
"--json-output",
"/path/to/tmp/json"
],
......@@ -15,7 +15,7 @@
"~followup_annotations": [
"@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"executable\": \"[START_DIR]/cipd/cipd\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
......@@ -29,7 +29,7 @@
"--platform",
"linux-amd64",
"--dest-directory",
"[SLAVE_BUILD]/cipd",
"[START_DIR]/cipd",
"--json-output",
"/path/to/tmp/json",
"--version",
......@@ -39,7 +39,7 @@
"~followup_annotations": [
"@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"executable\": \"[START_DIR]/cipd/cipd\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
......@@ -47,10 +47,10 @@
},
{
"cmd": [
"[SLAVE_BUILD]/cipd/cipd",
"[START_DIR]/cipd/cipd",
"ensure",
"--root",
"[SLAVE_BUILD]/packages",
"[START_DIR]/packages",
"--list",
"public/package/linux-amd64 7f751b2237df2fdf3c1405be00590fefffbaea2d",
"--json-output",
......@@ -73,7 +73,7 @@
},
{
"cmd": [
"[SLAVE_BUILD]/cipd/cipd",
"[START_DIR]/cipd/cipd",
"search",
"public/package/linux-amd64",
"--tag",
......@@ -98,7 +98,7 @@
},
{
"cmd": [
"[SLAVE_BUILD]/cipd/cipd",
"[START_DIR]/cipd/cipd",
"describe",
"public/package/linux-amd64",
"--version",
......
recipe_modules/cipd/example.expected/describe-many-instances.json
View file @ fbf01c54
......@@ -7,7 +7,7 @@
"--platform",
"linux-amd64",
"--dest-directory",
"[SLAVE_BUILD]/cipd",
"[START_DIR]/cipd",
"--json-output",
"/path/to/tmp/json"
],
......@@ -15,7 +15,7 @@
"~followup_annotations": [
"@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"executable\": \"[START_DIR]/cipd/cipd\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
......@@ -29,7 +29,7 @@
"--platform",
"linux-amd64",
"--dest-directory",
"[SLAVE_BUILD]/cipd",
"[START_DIR]/cipd",
"--json-output",
"/path/to/tmp/json",
"--version",
......@@ -39,7 +39,7 @@
"~followup_annotations": [
"@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"executable\": \"[START_DIR]/cipd/cipd\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
......@@ -47,10 +47,10 @@
},
{
"cmd": [
"[SLAVE_BUILD]/cipd/cipd",
"[START_DIR]/cipd/cipd",
"ensure",
"--root",
"[SLAVE_BUILD]/packages",
"[START_DIR]/packages",
"--list",
"public/package/linux-amd64 7f751b2237df2fdf3c1405be00590fefffbaea2d",
"--json-output",
......@@ -73,7 +73,7 @@
},
{
"cmd": [
"[SLAVE_BUILD]/cipd/cipd",
"[START_DIR]/cipd/cipd",
"search",
"public/package/linux-amd64",
"--tag",
......@@ -98,7 +98,7 @@
},
{
"cmd": [
"[SLAVE_BUILD]/cipd/cipd",
"[START_DIR]/cipd/cipd",
"describe",
"public/package/linux-amd64",
"--version",
......@@ -149,10 +149,10 @@
},
{
"cmd": [
"[SLAVE_BUILD]/cipd/cipd",
"[START_DIR]/cipd/cipd",
"ensure",
"--root",
"[SLAVE_BUILD]/packages",
"[START_DIR]/packages",
"--list",
"private/package/linux-amd64 latest\npublic/package/linux-amd64 7f751b2237df2fdf3c1405be00590fefffbaea2d",
"--json-output",
......@@ -179,7 +179,7 @@
},
{
"cmd": [
"[SLAVE_BUILD]/cipd/cipd",
"[START_DIR]/cipd/cipd",
"search",
"private/package/linux-amd64",
"--tag",
......@@ -204,7 +204,7 @@
},
{
"cmd": [
"[SLAVE_BUILD]/cipd/cipd",
"[START_DIR]/cipd/cipd",
"describe",
"private/package/linux-amd64",
"--version",
......@@ -250,7 +250,7 @@
},
{
"cmd": [
"[SLAVE_BUILD]/cipd/cipd",
"[START_DIR]/cipd/cipd",
"pkg-build",
"--in",
"fake-input-dir",
......@@ -274,7 +274,7 @@
},
{
"cmd": [
"[SLAVE_BUILD]/cipd/cipd",
"[START_DIR]/cipd/cipd",
"pkg-build",
"--in",
"fake-input-dir",
......@@ -300,7 +300,7 @@
},
{
"cmd": [
"[SLAVE_BUILD]/cipd/cipd",
"[START_DIR]/cipd/cipd",
"pkg-register",
"fake-package-path",
"--json-output",
......@@ -329,10 +329,10 @@
},
{
"cmd": [
"[SLAVE_BUILD]/cipd/cipd",
"[START_DIR]/cipd/cipd",
"create",
"--pkg-def",
"[SLAVE_BUILD]/fake-package.yaml",
"[START_DIR]/fake-package.yaml",
"--json-output",
"/path/to/tmp/json",
"--service-account-json",
......@@ -354,7 +354,7 @@
},
{
"cmd": [
"[SLAVE_BUILD]/cipd/cipd",
"[START_DIR]/cipd/cipd",
"set-tag",
"fake-package",
"--version",
......@@ -384,7 +384,7 @@
},
{
"cmd": [
"[SLAVE_BUILD]/cipd/cipd",
"[START_DIR]/cipd/cipd",
"set-ref",
"fake-package",
"--version",
......@@ -414,7 +414,7 @@
},
{
"cmd": [
"[SLAVE_BUILD]/cipd/cipd",
"[START_DIR]/cipd/cipd",
"search",
"fake-package/linux-amd64",
"--tag",
......
recipe_modules/cipd/example.expected/install-failed.json
View file @ fbf01c54
......@@ -7,7 +7,7 @@
"--platform",
"linux-amd64",
"--dest-directory",
"[SLAVE_BUILD]/cipd",
"[START_DIR]/cipd",
"--json-output",
"/path/to/tmp/json"
],
......@@ -15,7 +15,7 @@
"~followup_annotations": [
"step returned non-zero exit code: 1",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"executable\": \"[START_DIR]/cipd/cipd\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@",
......
recipe_modules/cipd/example.expected/mac64.json
View file @ fbf01c54
......@@ -7,7 +7,7 @@
"--platform",
"mac-amd64",
"--dest-directory",
"[SLAVE_BUILD]/cipd",
"[START_DIR]/cipd",
"--json-output",
"/path/to/tmp/json"
],
......@@ -15,7 +15,7 @@
"~followup_annotations": [
"@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"executable\": \"[START_DIR]/cipd/cipd\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
......@@ -29,7 +29,7 @@
"--platform",
"mac-amd64",
"--dest-directory",
"[SLAVE_BUILD]/cipd",
"[START_DIR]/cipd",
"--json-output",
"/path/to/tmp/json",
"--version",
......@@ -39,7 +39,7 @@
"~followup_annotations": [
"@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"executable\": \"[START_DIR]/cipd/cipd\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
......@@ -47,10 +47,10 @@
},
{
"cmd": [
"[SLAVE_BUILD]/cipd/cipd",
"[START_DIR]/cipd/cipd",
"ensure",
"--root",
"[SLAVE_BUILD]/packages",
"[START_DIR]/packages",
"--list",
"public/package/mac-amd64 7f751b2237df2fdf3c1405be00590fefffbaea2d",
"--json-output",
......@@ -73,7 +73,7 @@
},
{
"cmd": [
"[SLAVE_BUILD]/cipd/cipd",
"[START_DIR]/cipd/cipd",
"search",
"public/package/mac-amd64",
"--tag",
......@@ -98,7 +98,7 @@
},
{
"cmd": [
"[SLAVE_BUILD]/cipd/cipd",
"[START_DIR]/cipd/cipd",
"describe",
"public/package/mac-amd64",
"--version",
......@@ -149,10 +149,10 @@
},
{
"cmd": [
"[SLAVE_BUILD]/cipd/cipd",
"[START_DIR]/cipd/cipd",
"ensure",
"--root",
"[SLAVE_BUILD]/packages",
"[START_DIR]/packages",
"--list",
"private/package/mac-amd64 latest\npublic/package/mac-amd64 7f751b2237df2fdf3c1405be00590fefffbaea2d",
"--json-output",
......@@ -179,7 +179,7 @@
},
{
"cmd": [
"[SLAVE_BUILD]/cipd/cipd",
"[START_DIR]/cipd/cipd",
"search",
"private/package/mac-amd64",
"--tag",
......@@ -204,7 +204,7 @@
},
{
"cmd": [
"[SLAVE_BUILD]/cipd/cipd",
"[START_DIR]/cipd/cipd",
"describe",
"private/package/mac-amd64",
"--version",
......@@ -250,7 +250,7 @@
},
{
"cmd": [
"[SLAVE_BUILD]/cipd/cipd",
"[START_DIR]/cipd/cipd",
"pkg-build",
"--in",
"fake-input-dir",
......@@ -274,7 +274,7 @@
},
{
"cmd": [
"[SLAVE_BUILD]/cipd/cipd",
"[START_DIR]/cipd/cipd",
"pkg-build",
"--in",
"fake-input-dir",
......@@ -300,7 +300,7 @@
},
{
"cmd": [
"[SLAVE_BUILD]/cipd/cipd",
"[START_DIR]/cipd/cipd",
"pkg-register",
"fake-package-path",
"--json-output",
......@@ -329,10 +329,10 @@
},
{
"cmd": [
"[SLAVE_BUILD]/cipd/cipd",
"[START_DIR]/cipd/cipd",
"create",
"--pkg-def",
"[SLAVE_BUILD]/fake-package.yaml",
"[START_DIR]/fake-package.yaml",
"--json-output",
"/path/to/tmp/json",
"--service-account-json",
......@@ -354,7 +354,7 @@
},
{
"cmd": [
"[SLAVE_BUILD]/cipd/cipd",
"[START_DIR]/cipd/cipd",
"set-tag",
"fake-package",
"--version",
......@@ -384,7 +384,7 @@
},
{
"cmd": [
"[SLAVE_BUILD]/cipd/cipd",
"[START_DIR]/cipd/cipd",
"set-ref",
"fake-package",
"--version",
......@@ -414,7 +414,7 @@
},
{
"cmd": [
"[SLAVE_BUILD]/cipd/cipd",
"[START_DIR]/cipd/cipd",
"search",
"fake-package/mac-amd64",
"--tag",
......
recipe_modules/cipd/example.expected/win64.json
View file @ fbf01c54
......@@ -7,7 +7,7 @@
"--platform",
"windows-amd64",
"--dest-directory",
"[SLAVE_BUILD]\\cipd",
"[START_DIR]\\cipd",
"--json-output",
"/path/to/tmp/json"
],
......@@ -15,7 +15,7 @@
"~followup_annotations": [
"@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]\\\\cipd\\\\cipd\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"executable\": \"[START_DIR]\\\\cipd\\\\cipd\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
......@@ -29,7 +29,7 @@
"--platform",
"windows-amd64",
"--dest-directory",
"[SLAVE_BUILD]\\cipd",
"[START_DIR]\\cipd",
"--json-output",
"/path/to/tmp/json",
"--version",
......@@ -39,7 +39,7 @@
"~followup_annotations": [
"@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]\\\\cipd\\\\cipd\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"executable\": \"[START_DIR]\\\\cipd\\\\cipd\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
......@@ -47,10 +47,10 @@
},
{
"cmd": [
"[SLAVE_BUILD]\\cipd\\cipd",
"[START_DIR]\\cipd\\cipd",
"ensure",
"--root",
"[SLAVE_BUILD]\\packages",
"[START_DIR]\\packages",
"--list",
"public/package/windows-amd64 7f751b2237df2fdf3c1405be00590fefffbaea2d",
"--json-output",
......@@ -73,7 +73,7 @@
},
{
"cmd": [
"[SLAVE_BUILD]\\cipd\\cipd",
"[START_DIR]\\cipd\\cipd",
"search",
"public/package/windows-amd64",
"--tag",
......@@ -98,7 +98,7 @@
},
{
"cmd": [
"[SLAVE_BUILD]\\cipd\\cipd",
"[START_DIR]\\cipd\\cipd",
"describe",
"public/package/windows-amd64",
"--version",
......@@ -149,10 +149,10 @@
},
{
"cmd": [
"[SLAVE_BUILD]\\cipd\\cipd",
"[START_DIR]\\cipd\\cipd",
"ensure",
"--root",
"[SLAVE_BUILD]\\packages",
"[START_DIR]\\packages",
"--list",
"private/package/windows-amd64 latest\npublic/package/windows-amd64 7f751b2237df2fdf3c1405be00590fefffbaea2d",
"--json-output",
......@@ -179,7 +179,7 @@
},
{
"cmd": [
"[SLAVE_BUILD]\\cipd\\cipd",
"[START_DIR]\\cipd\\cipd",
"search",
"private/package/windows-amd64",
"--tag",
......@@ -204,7 +204,7 @@
},
{
"cmd": [
"[SLAVE_BUILD]\\cipd\\cipd",
"[START_DIR]\\cipd\\cipd",
"describe",
"private/package/windows-amd64",
"--version",
......@@ -250,7 +250,7 @@
},
{
"cmd": [
"[SLAVE_BUILD]\\cipd\\cipd",
"[START_DIR]\\cipd\\cipd",
"pkg-build",
"--in",
"fake-input-dir",
......@@ -274,7 +274,7 @@
},
{
"cmd": [
"[SLAVE_BUILD]\\cipd\\cipd",
"[START_DIR]\\cipd\\cipd",
"pkg-build",
"--in",
"fake-input-dir",
......@@ -300,7 +300,7 @@
},
{
"cmd": [
"[SLAVE_BUILD]\\cipd\\cipd",
"[START_DIR]\\cipd\\cipd",
"pkg-register",
"fake-package-path",
"--json-output",
......@@ -329,10 +329,10 @@
},
{
"cmd": [
"[SLAVE_BUILD]\\cipd\\cipd",
"[START_DIR]\\cipd\\cipd",
"create",
"--pkg-def",
"[SLAVE_BUILD]\\fake-package.yaml",
"[START_DIR]\\fake-package.yaml",
"--json-output",
"/path/to/tmp/json",
"--service-account-json",
......@@ -354,7 +354,7 @@
},
{
"cmd": [
"[SLAVE_BUILD]\\cipd\\cipd",
"[START_DIR]\\cipd\\cipd",
"set-tag",
"fake-package",
"--version",
......@@ -384,7 +384,7 @@
},
{
"cmd": [
"[SLAVE_BUILD]\\cipd\\cipd",
"[START_DIR]\\cipd\\cipd",
"set-ref",
"fake-package",
"--version",
......@@ -414,7 +414,7 @@
},
{
"cmd": [
"[SLAVE_BUILD]\\cipd\\cipd",
"[START_DIR]\\cipd\\cipd",
"search",
"fake-package/windows-amd64",
"--tag",
......
recipe_modules/cipd/example.py
View file @ fbf01c54
......@@ -24,7 +24,7 @@ def RunSteps(api):
package_instance_id = '7f751b2237df2fdf3c1405be00590fefffbaea2d'
packages = {package_name: package_instance_id}
cipd_root = api.path['slave_build'].join('packages')
cipd_root = api.path['start_dir'].join('packages')
# Some packages don't require credentials to be installed or queried.
api.cipd.ensure(cipd_root, packages)
step = api.cipd.search(package_name, tag='git_revision:40-chars-long-hash')
......@@ -54,7 +54,7 @@ def RunSteps(api):
'fake_tag_2': 'fake_value_2'})
# Create (build & register).
api.cipd.create(api.path['slave_build'].join('fake-package.yaml'),
api.cipd.create(api.path['start_dir'].join('fake-package.yaml'),
refs=['fake-ref-1', 'fake-ref-2'],
tags={'fake_tag_1': 'fake_value_1',
'fake_tag_2': 'fake_value_2'})
......
recipe_modules/cipd/test_api.py
View file @ fbf01c54
......@@ -30,7 +30,7 @@ class CIPDTestApi(recipe_test_api.RecipeTestApi):
return self.m.json.output(dic, retcode=retcode)
def make_test_executable(self):
return str(self.m.path['slave_build'].join('cipd', 'cipd'))
return str(self.m.path['start_dir'].join('cipd', 'cipd'))
def example_error(self, error, retcode=None):
return self._resultify(
......
recipe_modules/gclient/api.py
View file @ fbf01c54
......@@ -238,7 +238,7 @@ class GclientApi(recipe_api.RecipeApi):
name = 'recurse (git config %s)' % var
self(name, ['recurse', 'git', 'config', var, val], **kwargs)
finally:
cwd = kwargs.get('cwd', self.m.path['slave_build'])
cwd = kwargs.get('cwd', self.m.path['start_dir'])
if 'checkout' not in self.m.path:
self.m.path['checkout'] = cwd.join(
*cfg.solutions[0].name.split(self.m.path.sep))
......@@ -297,7 +297,7 @@ class GclientApi(recipe_api.RecipeApi):
print 'deleting %s' % path_to_file
os.remove(path_to_file)
""",
args=[self.m.path['slave_build']],
args=[self.m.path['start_dir']],
infra_step=True,
)
......
recipe_modules/gclient/example.expected/basic.json
View file @ fbf01c54
......@@ -87,7 +87,7 @@
"--spec",
"cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'Angle', 'url': 'https://chromium.googlesource.com/angle/angle.git'}]"
],
"cwd": "[SLAVE_BUILD]/src/third_party",
"cwd": "[START_DIR]/src/third_party",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
......@@ -113,7 +113,7 @@
"--output-json",
"/path/to/tmp/json"
],
"cwd": "[SLAVE_BUILD]/src/third_party",
"cwd": "[START_DIR]/src/third_party",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
......@@ -144,7 +144,7 @@
"user.name",
"local_bot"
],
"cwd": "[SLAVE_BUILD]/src/third_party",
"cwd": "[START_DIR]/src/third_party",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
......@@ -161,7 +161,7 @@
"user.email",
"local_bot@example.com"
],
"cwd": "[SLAVE_BUILD]/src/third_party",
"cwd": "[START_DIR]/src/third_party",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
......@@ -172,7 +172,7 @@
"python",
"-u",
"\nimport os, sys\n\nbuild_path = sys.argv[1]\nif os.path.exists(build_path):\n for (path, dir, files) in os.walk(build_path):\n for cur_file in files:\n if cur_file.endswith('index.lock'):\n path_to_file = os.path.join(path, cur_file)\n print 'deleting %s' % path_to_file\n os.remove(path_to_file)\n",
"[SLAVE_BUILD]"
"[START_DIR]"
],
"name": "cleanup index.lock",
"~followup_annotations": [
......@@ -197,7 +197,7 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"runhooks"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
......
recipe_modules/gclient/example.expected/revision.json
View file @ fbf01c54
......@@ -89,7 +89,7 @@
"--spec",
"cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'Angle', 'url': 'https://chromium.googlesource.com/angle/angle.git'}]"
],
"cwd": "[SLAVE_BUILD]/src/third_party",
"cwd": "[START_DIR]/src/third_party",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
......@@ -117,7 +117,7 @@
"--output-json",
"/path/to/tmp/json"
],
"cwd": "[SLAVE_BUILD]/src/third_party",
"cwd": "[START_DIR]/src/third_party",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
......@@ -148,7 +148,7 @@
"user.name",
"local_bot"
],
"cwd": "[SLAVE_BUILD]/src/third_party",
"cwd": "[START_DIR]/src/third_party",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
......@@ -165,7 +165,7 @@
"user.email",
"local_bot@example.com"
],
"cwd": "[SLAVE_BUILD]/src/third_party",
"cwd": "[START_DIR]/src/third_party",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
......@@ -176,7 +176,7 @@
"python",
"-u",
"\nimport os, sys\n\nbuild_path = sys.argv[1]\nif os.path.exists(build_path):\n for (path, dir, files) in os.walk(build_path):\n for cur_file in files:\n if cur_file.endswith('index.lock'):\n path_to_file = os.path.join(path, cur_file)\n print 'deleting %s' % path_to_file\n os.remove(path_to_file)\n",
"[SLAVE_BUILD]"
"[START_DIR]"
],
"name": "cleanup index.lock",
"~followup_annotations": [
......@@ -201,7 +201,7 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"runhooks"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
......
recipe_modules/gclient/example.expected/tryserver.json
View file @ fbf01c54
......@@ -89,7 +89,7 @@
"--spec",
"cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'Angle', 'url': 'https://chromium.googlesource.com/angle/angle.git'}]"
],
"cwd": "[SLAVE_BUILD]/src/third_party",
"cwd": "[START_DIR]/src/third_party",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
......@@ -117,7 +117,7 @@
"--output-json",
"/path/to/tmp/json"
],
"cwd": "[SLAVE_BUILD]/src/third_party",
"cwd": "[START_DIR]/src/third_party",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
......@@ -148,7 +148,7 @@
"user.name",
"local_bot"
],
"cwd": "[SLAVE_BUILD]/src/third_party",
"cwd": "[START_DIR]/src/third_party",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
......@@ -165,7 +165,7 @@
"user.email",
"local_bot@example.com"
],
"cwd": "[SLAVE_BUILD]/src/third_party",
"cwd": "[START_DIR]/src/third_party",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
......@@ -176,7 +176,7 @@
"python",
"-u",
"\nimport os, sys\n\nbuild_path = sys.argv[1]\nif os.path.exists(build_path):\n for (path, dir, files) in os.walk(build_path):\n for cur_file in files:\n if cur_file.endswith('index.lock'):\n path_to_file = os.path.join(path, cur_file)\n print 'deleting %s' % path_to_file\n os.remove(path_to_file)\n",
"[SLAVE_BUILD]"
"[START_DIR]"
],
"name": "cleanup index.lock",
"~followup_annotations": [
......@@ -201,7 +201,7 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"runhooks"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
......
recipe_modules/gclient/example.py
View file @ fbf01c54
......@@ -81,7 +81,7 @@ def RunSteps(api):
api.gclient.checkout(
gclient_config=bl_cfg,
with_branch_heads=True,
cwd=api.path['slave_build'].join('src', 'third_party'))
cwd=api.path['start_dir'].join('src', 'third_party'))
api.gclient.break_locks()
......
recipe_modules/git/api.py
View file @ fbf01c54
......@@ -186,7 +186,7 @@ class GitApi(recipe_api.RecipeApi):
# ex: ssh://host:repo/foobar/.git
dir_path = dir_path or dir_path.rsplit('/', 1)[-1]
dir_path = self.m.path['slave_build'].join(dir_path)
dir_path = self.m.path['start_dir'].join(dir_path)
if 'checkout' not in self.m.path:
self.m.path['checkout'] = dir_path
......
recipe_modules/git/example.expected/basic.json
View file @ fbf01c54
......@@ -5,7 +5,7 @@
"-u",
"RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
"--path",
"[SLAVE_BUILD]/src",
"[START_DIR]/src",
"--url",
"https://chromium.googlesource.com/chromium/src.git"
],
......@@ -20,7 +20,7 @@
"master",
"--recurse-submodules"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -33,7 +33,7 @@
"-f",
"FETCH_HEAD"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git checkout"
},
{
......@@ -42,7 +42,7 @@
"rev-parse",
"HEAD"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "read revision",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......@@ -57,7 +57,7 @@
"-d",
"-x"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git clean"
},
{
......@@ -66,7 +66,7 @@
"submodule",
"sync"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "submodule sync"
},
{
......@@ -77,7 +77,7 @@
"--init",
"--recursive"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "submodule update"
},
{
......@@ -88,7 +88,7 @@
"count-objects",
"-v"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "count-objects",
"stdout": "/path/to/tmp/"
},
......@@ -99,7 +99,7 @@
"--get",
"remote.origin.url"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git config remote.origin.url",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......@@ -114,7 +114,7 @@
"--format=%at",
"-s"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git show",
"stdout": "/path/to/tmp/"
},
......@@ -125,7 +125,7 @@
"origin",
"--tags"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git fetch tags"
},
{
......@@ -133,7 +133,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status"
},
{
......@@ -141,7 +141,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status can_fail_build"
},
{
......@@ -149,7 +149,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status cannot_fail_build"
},
{
......@@ -158,7 +158,7 @@
"new-branch",
"refactor"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -172,7 +172,7 @@
"--upstream",
"refactor"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -184,7 +184,7 @@
"rebase",
"origin/master"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "my repo rebase"
},
{
......@@ -192,10 +192,10 @@
"git",
"bundle",
"create",
"[SLAVE_BUILD]/all.bundle",
"[START_DIR]/all.bundle",
"--all"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git bundle"
},
{
......
recipe_modules/git/example.expected/basic_branch.json
View file @ fbf01c54
......@@ -5,7 +5,7 @@
"-u",
"RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
"--path",
"[SLAVE_BUILD]/src",
"[START_DIR]/src",
"--url",
"https://chromium.googlesource.com/chromium/src.git"
],
......@@ -20,7 +20,7 @@
"testing",
"--recurse-submodules"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -33,7 +33,7 @@
"-f",
"FETCH_HEAD"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git checkout"
},
{
......@@ -42,7 +42,7 @@
"rev-parse",
"HEAD"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "read revision",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......@@ -57,7 +57,7 @@
"-d",
"-x"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git clean"
},
{
......@@ -66,7 +66,7 @@
"submodule",
"sync"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "submodule sync"
},
{
......@@ -77,7 +77,7 @@
"--init",
"--recursive"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "submodule update"
},
{
......@@ -88,7 +88,7 @@
"count-objects",
"-v"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "count-objects",
"stdout": "/path/to/tmp/"
},
......@@ -99,7 +99,7 @@
"--get",
"remote.origin.url"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git config remote.origin.url",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......@@ -114,7 +114,7 @@
"--format=%at",
"-s"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git show",
"stdout": "/path/to/tmp/"
},
......@@ -125,7 +125,7 @@
"origin",
"--tags"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git fetch tags"
},
{
......@@ -133,7 +133,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status"
},
{
......@@ -141,7 +141,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status can_fail_build"
},
{
......@@ -149,7 +149,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status cannot_fail_build"
},
{
......@@ -158,7 +158,7 @@
"new-branch",
"refactor"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -172,7 +172,7 @@
"--upstream",
"refactor"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -184,7 +184,7 @@
"rebase",
"origin/master"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "my repo rebase"
},
{
......@@ -192,10 +192,10 @@
"git",
"bundle",
"create",
"[SLAVE_BUILD]/all.bundle",
"[START_DIR]/all.bundle",
"--all"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git bundle"
},
{
......
recipe_modules/git/example.expected/basic_file_name.json
View file @ fbf01c54
......@@ -5,7 +5,7 @@
"-u",
"RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
"--path",
"[SLAVE_BUILD]/src",
"[START_DIR]/src",
"--url",
"https://chromium.googlesource.com/chromium/src.git"
],
......@@ -20,7 +20,7 @@
"master",
"--recurse-submodules"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -35,7 +35,7 @@
"--",
"DEPS"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git checkout"
},
{
......@@ -44,7 +44,7 @@
"rev-parse",
"HEAD"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "read revision",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......@@ -59,7 +59,7 @@
"-d",
"-x"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git clean"
},
{
......@@ -68,7 +68,7 @@
"submodule",
"sync"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "submodule sync"
},
{
......@@ -79,7 +79,7 @@
"--init",
"--recursive"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "submodule update"
},
{
......@@ -90,7 +90,7 @@
"count-objects",
"-v"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "count-objects",
"stdout": "/path/to/tmp/"
},
......@@ -101,7 +101,7 @@
"--get",
"remote.origin.url"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git config remote.origin.url",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......@@ -116,7 +116,7 @@
"--format=%at",
"-s"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git show",
"stdout": "/path/to/tmp/"
},
......@@ -127,7 +127,7 @@
"origin",
"--tags"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git fetch tags"
},
{
......@@ -135,7 +135,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status"
},
{
......@@ -143,7 +143,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status can_fail_build"
},
{
......@@ -151,7 +151,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status cannot_fail_build"
},
{
......@@ -160,7 +160,7 @@
"new-branch",
"refactor"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -174,7 +174,7 @@
"--upstream",
"refactor"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -186,7 +186,7 @@
"rebase",
"origin/master"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "my repo rebase"
},
{
......@@ -194,10 +194,10 @@
"git",
"bundle",
"create",
"[SLAVE_BUILD]/all.bundle",
"[START_DIR]/all.bundle",
"--all"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git bundle"
},
{
......
recipe_modules/git/example.expected/basic_hash.json
View file @ fbf01c54
......@@ -5,7 +5,7 @@
"-u",
"RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
"--path",
"[SLAVE_BUILD]/src",
"[START_DIR]/src",
"--url",
"https://chromium.googlesource.com/chromium/src.git"
],
......@@ -19,7 +19,7 @@
"origin",
"--recurse-submodules"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -32,7 +32,7 @@
"-f",
"abcdef0123456789abcdef0123456789abcdef01"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git checkout"
},
{
......@@ -41,7 +41,7 @@
"rev-parse",
"HEAD"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "read revision",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......@@ -56,7 +56,7 @@
"-d",
"-x"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git clean"
},
{
......@@ -65,7 +65,7 @@
"submodule",
"sync"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "submodule sync"
},
{
......@@ -76,7 +76,7 @@
"--init",
"--recursive"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "submodule update"
},
{
......@@ -87,7 +87,7 @@
"count-objects",
"-v"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "count-objects",
"stdout": "/path/to/tmp/"
},
......@@ -98,7 +98,7 @@
"--get",
"remote.origin.url"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git config remote.origin.url",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......@@ -113,7 +113,7 @@
"--format=%at",
"-s"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git show",
"stdout": "/path/to/tmp/"
},
......@@ -124,7 +124,7 @@
"origin",
"--tags"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git fetch tags"
},
{
......@@ -132,7 +132,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status"
},
{
......@@ -140,7 +140,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status can_fail_build"
},
{
......@@ -148,7 +148,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status cannot_fail_build"
},
{
......@@ -157,7 +157,7 @@
"new-branch",
"refactor"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -171,7 +171,7 @@
"--upstream",
"refactor"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -183,7 +183,7 @@
"rebase",
"origin/master"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "my repo rebase"
},
{
......@@ -191,10 +191,10 @@
"git",
"bundle",
"create",
"[SLAVE_BUILD]/all.bundle",
"[START_DIR]/all.bundle",
"--all"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git bundle"
},
{
......
recipe_modules/git/example.expected/basic_ref.json
View file @ fbf01c54
......@@ -5,7 +5,7 @@
"-u",
"RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
"--path",
"[SLAVE_BUILD]/src",
"[START_DIR]/src",
"--url",
"https://chromium.googlesource.com/chromium/src.git"
],
......@@ -20,7 +20,7 @@
"refs/foo/bar",
"--recurse-submodules"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -33,7 +33,7 @@
"-f",
"FETCH_HEAD"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git checkout"
},
{
......@@ -42,7 +42,7 @@
"rev-parse",
"HEAD"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "read revision",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......@@ -57,7 +57,7 @@
"-d",
"-x"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git clean"
},
{
......@@ -66,7 +66,7 @@
"submodule",
"sync"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "submodule sync"
},
{
......@@ -77,7 +77,7 @@
"--init",
"--recursive"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "submodule update"
},
{
......@@ -88,7 +88,7 @@
"count-objects",
"-v"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "count-objects",
"stdout": "/path/to/tmp/"
},
......@@ -99,7 +99,7 @@
"--get",
"remote.origin.url"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git config remote.origin.url",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......@@ -114,7 +114,7 @@
"--format=%at",
"-s"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git show",
"stdout": "/path/to/tmp/"
},
......@@ -125,7 +125,7 @@
"origin",
"--tags"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git fetch tags"
},
{
......@@ -133,7 +133,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status"
},
{
......@@ -141,7 +141,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status can_fail_build"
},
{
......@@ -149,7 +149,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status cannot_fail_build"
},
{
......@@ -158,7 +158,7 @@
"new-branch",
"refactor"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -172,7 +172,7 @@
"--upstream",
"refactor"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -184,7 +184,7 @@
"rebase",
"origin/master"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "my repo rebase"
},
{
......@@ -192,10 +192,10 @@
"git",
"bundle",
"create",
"[SLAVE_BUILD]/all.bundle",
"[START_DIR]/all.bundle",
"--all"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git bundle"
},
{
......
recipe_modules/git/example.expected/basic_submodule_update_force.json
View file @ fbf01c54
......@@ -5,7 +5,7 @@
"-u",
"RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
"--path",
"[SLAVE_BUILD]/src",
"[START_DIR]/src",
"--url",
"https://chromium.googlesource.com/chromium/src.git"
],
......@@ -20,7 +20,7 @@
"master",
"--recurse-submodules"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -33,7 +33,7 @@
"-f",
"FETCH_HEAD"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git checkout"
},
{
......@@ -42,7 +42,7 @@
"rev-parse",
"HEAD"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "read revision",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......@@ -57,7 +57,7 @@
"-d",
"-x"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git clean"
},
{
......@@ -66,7 +66,7 @@
"submodule",
"sync"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "submodule sync"
},
{
......@@ -78,7 +78,7 @@
"--recursive",
"--force"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "submodule update"
},
{
......@@ -89,7 +89,7 @@
"count-objects",
"-v"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "count-objects",
"stdout": "/path/to/tmp/"
},
......@@ -100,7 +100,7 @@
"--get",
"remote.origin.url"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git config remote.origin.url",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......@@ -115,7 +115,7 @@
"--format=%at",
"-s"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git show",
"stdout": "/path/to/tmp/"
},
......@@ -126,7 +126,7 @@
"origin",
"--tags"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git fetch tags"
},
{
......@@ -134,7 +134,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status"
},
{
......@@ -142,7 +142,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status can_fail_build"
},
{
......@@ -150,7 +150,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status cannot_fail_build"
},
{
......@@ -159,7 +159,7 @@
"new-branch",
"refactor"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -173,7 +173,7 @@
"--upstream",
"refactor"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -185,7 +185,7 @@
"rebase",
"origin/master"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "my repo rebase"
},
{
......@@ -193,10 +193,10 @@
"git",
"bundle",
"create",
"[SLAVE_BUILD]/all.bundle",
"[START_DIR]/all.bundle",
"--all"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git bundle"
},
{
......
recipe_modules/git/example.expected/can_fail_build.json
View file @ fbf01c54
......@@ -5,7 +5,7 @@
"-u",
"RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
"--path",
"[SLAVE_BUILD]/src",
"[START_DIR]/src",
"--url",
"https://chromium.googlesource.com/chromium/src.git"
],
......@@ -20,7 +20,7 @@
"master",
"--recurse-submodules"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -33,7 +33,7 @@
"-f",
"FETCH_HEAD"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git checkout"
},
{
......@@ -42,7 +42,7 @@
"rev-parse",
"HEAD"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "read revision",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......@@ -57,7 +57,7 @@
"-d",
"-x"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git clean"
},
{
......@@ -66,7 +66,7 @@
"submodule",
"sync"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "submodule sync"
},
{
......@@ -77,7 +77,7 @@
"--init",
"--recursive"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "submodule update"
},
{
......@@ -88,7 +88,7 @@
"count-objects",
"-v"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "count-objects",
"stdout": "/path/to/tmp/"
},
......@@ -99,7 +99,7 @@
"--get",
"remote.origin.url"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git config remote.origin.url",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......@@ -114,7 +114,7 @@
"--format=%at",
"-s"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git show",
"stdout": "/path/to/tmp/"
},
......@@ -125,7 +125,7 @@
"origin",
"--tags"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git fetch tags"
},
{
......@@ -133,7 +133,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status"
},
{
......@@ -141,7 +141,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status can_fail_build",
"~followup_annotations": [
"step returned non-zero exit code: 1",
......
recipe_modules/git/example.expected/cannot_fail_build.json
View file @ fbf01c54
......@@ -5,7 +5,7 @@
"-u",
"RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
"--path",
"[SLAVE_BUILD]/src",
"[START_DIR]/src",
"--url",
"https://chromium.googlesource.com/chromium/src.git"
],
......@@ -20,7 +20,7 @@
"master",
"--recurse-submodules"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -33,7 +33,7 @@
"-f",
"FETCH_HEAD"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git checkout"
},
{
......@@ -42,7 +42,7 @@
"rev-parse",
"HEAD"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "read revision",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......@@ -57,7 +57,7 @@
"-d",
"-x"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git clean"
},
{
......@@ -66,7 +66,7 @@
"submodule",
"sync"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "submodule sync"
},
{
......@@ -77,7 +77,7 @@
"--init",
"--recursive"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "submodule update"
},
{
......@@ -88,7 +88,7 @@
"count-objects",
"-v"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "count-objects",
"stdout": "/path/to/tmp/"
},
......@@ -99,7 +99,7 @@
"--get",
"remote.origin.url"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git config remote.origin.url",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......@@ -114,7 +114,7 @@
"--format=%at",
"-s"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git show",
"stdout": "/path/to/tmp/"
},
......@@ -125,7 +125,7 @@
"origin",
"--tags"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git fetch tags"
},
{
......@@ -133,7 +133,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status"
},
{
......@@ -141,7 +141,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status can_fail_build"
},
{
......@@ -149,7 +149,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status cannot_fail_build",
"~followup_annotations": [
"step returned non-zero exit code: 1",
......@@ -162,7 +162,7 @@
"new-branch",
"refactor"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -176,7 +176,7 @@
"--upstream",
"refactor"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -188,7 +188,7 @@
"rebase",
"origin/master"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "my repo rebase"
},
{
......@@ -196,10 +196,10 @@
"git",
"bundle",
"create",
"[SLAVE_BUILD]/all.bundle",
"[START_DIR]/all.bundle",
"--all"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git bundle"
},
{
......
recipe_modules/git/example.expected/cat-file_test.json
View file @ fbf01c54
......@@ -5,7 +5,7 @@
"-u",
"RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
"--path",
"[SLAVE_BUILD]/src",
"[START_DIR]/src",
"--url",
"https://chromium.googlesource.com/chromium/src.git"
],
......@@ -20,7 +20,7 @@
"abcdef12345",
"--recurse-submodules"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -33,7 +33,7 @@
"-f",
"FETCH_HEAD"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git checkout"
},
{
......@@ -42,7 +42,7 @@
"rev-parse",
"HEAD"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "read revision",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......@@ -57,7 +57,7 @@
"-d",
"-x"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git clean"
},
{
......@@ -66,7 +66,7 @@
"submodule",
"sync"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "submodule sync"
},
{
......@@ -77,7 +77,7 @@
"--init",
"--recursive"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "submodule update"
},
{
......@@ -88,7 +88,7 @@
"count-objects",
"-v"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "count-objects",
"stdout": "/path/to/tmp/"
},
......@@ -99,7 +99,7 @@
"--get",
"remote.origin.url"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git config remote.origin.url",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......@@ -114,7 +114,7 @@
"--format=%at",
"-s"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git show",
"stdout": "/path/to/tmp/"
},
......@@ -125,7 +125,7 @@
"origin",
"--tags"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git fetch tags"
},
{
......@@ -133,7 +133,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status"
},
{
......@@ -141,7 +141,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status can_fail_build"
},
{
......@@ -149,7 +149,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status cannot_fail_build"
},
{
......@@ -158,7 +158,7 @@
"new-branch",
"refactor"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -172,7 +172,7 @@
"--upstream",
"refactor"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -184,7 +184,7 @@
"rebase",
"origin/master"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "my repo rebase"
},
{
......@@ -194,7 +194,7 @@
"origin",
"--tags"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git fetch tags (2)",
"stdout": "/path/to/tmp/"
},
......@@ -205,7 +205,7 @@
"blob",
"abcdef12345:TestFile"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git cat-file abcdef12345:TestFile",
"stdout": "/path/to/tmp/"
},
......@@ -214,10 +214,10 @@
"git",
"bundle",
"create",
"[SLAVE_BUILD]/all.bundle",
"[START_DIR]/all.bundle",
"--all"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git bundle"
},
{
......
recipe_modules/git/example.expected/count-objects_delta.json
View file @ fbf01c54
......@@ -5,7 +5,7 @@
"-u",
"RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
"--path",
"[SLAVE_BUILD]/src",
"[START_DIR]/src",
"--url",
"https://chromium.googlesource.com/chromium/src.git"
],
......@@ -17,7 +17,7 @@
"count-objects",
"-v"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "count-objects before git fetch",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......@@ -41,7 +41,7 @@
"master",
"--recurse-submodules"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -53,7 +53,7 @@
"count-objects",
"-v"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "count-objects after git fetch",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......@@ -106,7 +106,7 @@
"-f",
"FETCH_HEAD"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git checkout"
},
{
......@@ -115,7 +115,7 @@
"rev-parse",
"HEAD"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "read revision",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......@@ -130,7 +130,7 @@
"-d",
"-x"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git clean"
},
{
......@@ -139,7 +139,7 @@
"submodule",
"sync"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "submodule sync"
},
{
......@@ -150,7 +150,7 @@
"--init",
"--recursive"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "submodule update"
},
{
......@@ -161,7 +161,7 @@
"count-objects",
"-v"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "count-objects",
"stdout": "/path/to/tmp/"
},
......@@ -172,7 +172,7 @@
"--get",
"remote.origin.url"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git config remote.origin.url",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......@@ -187,7 +187,7 @@
"--format=%at",
"-s"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git show",
"stdout": "/path/to/tmp/"
},
......@@ -198,7 +198,7 @@
"origin",
"--tags"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git fetch tags"
},
{
......@@ -206,7 +206,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status"
},
{
......@@ -214,7 +214,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status can_fail_build"
},
{
......@@ -222,7 +222,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status cannot_fail_build"
},
{
......@@ -231,7 +231,7 @@
"new-branch",
"refactor"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -245,7 +245,7 @@
"--upstream",
"refactor"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -257,7 +257,7 @@
"rebase",
"origin/master"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "my repo rebase"
},
{
......@@ -265,10 +265,10 @@
"git",
"bundle",
"create",
"[SLAVE_BUILD]/all.bundle",
"[START_DIR]/all.bundle",
"--all"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git bundle"
},
{
......
recipe_modules/git/example.expected/count-objects_failed.json
View file @ fbf01c54
......@@ -5,7 +5,7 @@
"-u",
"RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
"--path",
"[SLAVE_BUILD]/src",
"[START_DIR]/src",
"--url",
"https://chromium.googlesource.com/chromium/src.git"
],
......@@ -20,7 +20,7 @@
"master",
"--recurse-submodules"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -33,7 +33,7 @@
"-f",
"FETCH_HEAD"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git checkout"
},
{
......@@ -42,7 +42,7 @@
"rev-parse",
"HEAD"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "read revision",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......@@ -57,7 +57,7 @@
"-d",
"-x"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git clean"
},
{
......@@ -66,7 +66,7 @@
"submodule",
"sync"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "submodule sync"
},
{
......@@ -77,7 +77,7 @@
"--init",
"--recursive"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "submodule update"
},
{
......@@ -88,7 +88,7 @@
"count-objects",
"-v"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "count-objects",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......@@ -103,7 +103,7 @@
"--get",
"remote.origin.url"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git config remote.origin.url",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......@@ -118,7 +118,7 @@
"--format=%at",
"-s"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git show",
"stdout": "/path/to/tmp/"
},
......@@ -129,7 +129,7 @@
"origin",
"--tags"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git fetch tags"
},
{
......@@ -137,7 +137,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status"
},
{
......@@ -145,7 +145,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status can_fail_build"
},
{
......@@ -153,7 +153,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status cannot_fail_build"
},
{
......@@ -162,7 +162,7 @@
"new-branch",
"refactor"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -176,7 +176,7 @@
"--upstream",
"refactor"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -188,7 +188,7 @@
"rebase",
"origin/master"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "my repo rebase"
},
{
......@@ -196,10 +196,10 @@
"git",
"bundle",
"create",
"[SLAVE_BUILD]/all.bundle",
"[START_DIR]/all.bundle",
"--all"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git bundle"
},
{
......
recipe_modules/git/example.expected/count-objects_with_bad_output.json
View file @ fbf01c54
......@@ -5,7 +5,7 @@
"-u",
"RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
"--path",
"[SLAVE_BUILD]/src",
"[START_DIR]/src",
"--url",
"https://chromium.googlesource.com/chromium/src.git"
],
......@@ -20,7 +20,7 @@
"master",
"--recurse-submodules"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -33,7 +33,7 @@
"-f",
"FETCH_HEAD"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git checkout"
},
{
......@@ -42,7 +42,7 @@
"rev-parse",
"HEAD"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "read revision",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......@@ -57,7 +57,7 @@
"-d",
"-x"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git clean"
},
{
......@@ -66,7 +66,7 @@
"submodule",
"sync"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "submodule sync"
},
{
......@@ -77,7 +77,7 @@
"--init",
"--recursive"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "submodule update"
},
{
......@@ -88,7 +88,7 @@
"count-objects",
"-v"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "count-objects",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......@@ -104,7 +104,7 @@
"--get",
"remote.origin.url"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git config remote.origin.url",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......@@ -119,7 +119,7 @@
"--format=%at",
"-s"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git show",
"stdout": "/path/to/tmp/"
},
......@@ -130,7 +130,7 @@
"origin",
"--tags"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git fetch tags"
},
{
......@@ -138,7 +138,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status"
},
{
......@@ -146,7 +146,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status can_fail_build"
},
{
......@@ -154,7 +154,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status cannot_fail_build"
},
{
......@@ -163,7 +163,7 @@
"new-branch",
"refactor"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -177,7 +177,7 @@
"--upstream",
"refactor"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -189,7 +189,7 @@
"rebase",
"origin/master"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "my repo rebase"
},
{
......@@ -197,10 +197,10 @@
"git",
"bundle",
"create",
"[SLAVE_BUILD]/all.bundle",
"[START_DIR]/all.bundle",
"--all"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git bundle"
},
{
......
recipe_modules/git/example.expected/count-objects_with_bad_output_fails_build.json
View file @ fbf01c54
......@@ -5,7 +5,7 @@
"-u",
"RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
"--path",
"[SLAVE_BUILD]/src",
"[START_DIR]/src",
"--url",
"https://chromium.googlesource.com/chromium/src.git"
],
......@@ -20,7 +20,7 @@
"master",
"--recurse-submodules"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -33,7 +33,7 @@
"-f",
"FETCH_HEAD"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git checkout"
},
{
......@@ -42,7 +42,7 @@
"rev-parse",
"HEAD"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "read revision",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......@@ -57,7 +57,7 @@
"-d",
"-x"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git clean"
},
{
......@@ -66,7 +66,7 @@
"submodule",
"sync"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "submodule sync"
},
{
......@@ -77,7 +77,7 @@
"--init",
"--recursive"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "submodule update"
},
{
......@@ -88,7 +88,7 @@
"count-objects",
"-v"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "count-objects",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......
recipe_modules/git/example.expected/curl_trace_file.json
View file @ fbf01c54
......@@ -5,7 +5,7 @@
"-u",
"RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
"--path",
"[SLAVE_BUILD]/src",
"[START_DIR]/src",
"--url",
"https://chromium.googlesource.com/chromium/src.git"
],
......@@ -20,13 +20,13 @@
"refs/foo/bar",
"--recurse-submodules"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"GIT_CURL_VERBOSE": "1",
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
"name": "git fetch",
"stderr": "[SLAVE_BUILD]/curl_trace.log"
"stderr": "[START_DIR]/curl_trace.log"
},
{
"cmd": [
......@@ -35,7 +35,7 @@
"-f",
"FETCH_HEAD"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git checkout"
},
{
......@@ -44,7 +44,7 @@
"rev-parse",
"HEAD"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "read revision",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......@@ -59,7 +59,7 @@
"-d",
"-x"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git clean"
},
{
......@@ -68,7 +68,7 @@
"submodule",
"sync"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "submodule sync"
},
{
......@@ -79,7 +79,7 @@
"--init",
"--recursive"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "submodule update"
},
{
......@@ -90,7 +90,7 @@
"count-objects",
"-v"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "count-objects",
"stdout": "/path/to/tmp/"
},
......@@ -101,7 +101,7 @@
"--get",
"remote.origin.url"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git config remote.origin.url",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......@@ -116,7 +116,7 @@
"--format=%at",
"-s"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git show",
"stdout": "/path/to/tmp/"
},
......@@ -127,7 +127,7 @@
"origin",
"--tags"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git fetch tags"
},
{
......@@ -135,7 +135,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status"
},
{
......@@ -143,7 +143,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status can_fail_build"
},
{
......@@ -151,7 +151,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status cannot_fail_build"
},
{
......@@ -160,7 +160,7 @@
"new-branch",
"refactor"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -174,7 +174,7 @@
"--upstream",
"refactor"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -186,7 +186,7 @@
"rebase",
"origin/master"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "my repo rebase"
},
{
......@@ -194,10 +194,10 @@
"git",
"bundle",
"create",
"[SLAVE_BUILD]/all.bundle",
"[START_DIR]/all.bundle",
"--all"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git bundle"
},
{
......
recipe_modules/git/example.expected/git-cache-checkout.json
View file @ fbf01c54
......@@ -5,7 +5,7 @@
"-u",
"RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
"--path",
"[SLAVE_BUILD]/src",
"[START_DIR]/src",
"--url",
"https://chromium.googlesource.com/chromium/src.git"
],
......@@ -21,7 +21,7 @@
"[GIT_CACHE]",
"https://chromium.googlesource.com/chromium/src.git"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -37,7 +37,7 @@
"[GIT_CACHE]",
"https://chromium.googlesource.com/chromium/src.git"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -52,7 +52,7 @@
"origin",
"mirror_dir"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -67,7 +67,7 @@
"master",
"--recurse-submodules"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -80,7 +80,7 @@
"-f",
"FETCH_HEAD"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git checkout"
},
{
......@@ -89,7 +89,7 @@
"rev-parse",
"HEAD"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "read revision",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......@@ -104,7 +104,7 @@
"-d",
"-x"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git clean"
},
{
......@@ -113,7 +113,7 @@
"submodule",
"sync"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "submodule sync"
},
{
......@@ -124,7 +124,7 @@
"--init",
"--recursive"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "submodule update"
},
{
......@@ -135,7 +135,7 @@
"count-objects",
"-v"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "count-objects",
"stdout": "/path/to/tmp/"
},
......@@ -146,7 +146,7 @@
"--get",
"remote.origin.url"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git config remote.origin.url",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......@@ -161,7 +161,7 @@
"--format=%at",
"-s"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git show",
"stdout": "/path/to/tmp/"
},
......@@ -172,7 +172,7 @@
"origin",
"--tags"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git fetch tags"
},
{
......@@ -180,7 +180,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status"
},
{
......@@ -188,7 +188,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status can_fail_build"
},
{
......@@ -196,7 +196,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status cannot_fail_build"
},
{
......@@ -205,7 +205,7 @@
"new-branch",
"refactor"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -219,7 +219,7 @@
"--upstream",
"refactor"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -231,7 +231,7 @@
"rebase",
"origin/master"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "my repo rebase"
},
{
......@@ -239,10 +239,10 @@
"git",
"bundle",
"create",
"[SLAVE_BUILD]/all.bundle",
"[START_DIR]/all.bundle",
"--all"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git bundle"
},
{
......
recipe_modules/git/example.expected/platform_win.json
View file @ fbf01c54
......@@ -16,7 +16,7 @@
"-u",
"RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
"--path",
"[SLAVE_BUILD]\\src",
"[START_DIR]\\src",
"--url",
"https://chromium.googlesource.com/chromium/src.git",
"--git_cmd_path",
......@@ -33,7 +33,7 @@
"master",
"--recurse-submodules"
],
"cwd": "[SLAVE_BUILD]\\src",
"cwd": "[START_DIR]\\src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools];%(PATH)s"
},
......@@ -46,7 +46,7 @@
"-f",
"FETCH_HEAD"
],
"cwd": "[SLAVE_BUILD]\\src",
"cwd": "[START_DIR]\\src",
"name": "git checkout"
},
{
......@@ -55,7 +55,7 @@
"rev-parse",
"HEAD"
],
"cwd": "[SLAVE_BUILD]\\src",
"cwd": "[START_DIR]\\src",
"name": "read revision",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......@@ -70,7 +70,7 @@
"-d",
"-x"
],
"cwd": "[SLAVE_BUILD]\\src",
"cwd": "[START_DIR]\\src",
"name": "git clean"
},
{
......@@ -79,7 +79,7 @@
"submodule",
"sync"
],
"cwd": "[SLAVE_BUILD]\\src",
"cwd": "[START_DIR]\\src",
"name": "submodule sync"
},
{
......@@ -90,7 +90,7 @@
"--init",
"--recursive"
],
"cwd": "[SLAVE_BUILD]\\src",
"cwd": "[START_DIR]\\src",
"name": "submodule update"
},
{
......@@ -101,7 +101,7 @@
"count-objects",
"-v"
],
"cwd": "[SLAVE_BUILD]\\src",
"cwd": "[START_DIR]\\src",
"name": "count-objects",
"stdout": "/path/to/tmp/"
},
......@@ -112,7 +112,7 @@
"--get",
"remote.origin.url"
],
"cwd": "[SLAVE_BUILD]\\src",
"cwd": "[START_DIR]\\src",
"name": "git config remote.origin.url",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......@@ -127,7 +127,7 @@
"--format=%at",
"-s"
],
"cwd": "[SLAVE_BUILD]\\src",
"cwd": "[START_DIR]\\src",
"name": "git show",
"stdout": "/path/to/tmp/"
},
......@@ -138,7 +138,7 @@
"origin",
"--tags"
],
"cwd": "[SLAVE_BUILD]\\src",
"cwd": "[START_DIR]\\src",
"name": "git fetch tags"
},
{
......@@ -146,7 +146,7 @@
"RECIPE_PACKAGE_REPO[depot_tools]\\git.bat",
"status"
],
"cwd": "[SLAVE_BUILD]\\src",
"cwd": "[START_DIR]\\src",
"name": "git status"
},
{
......@@ -154,7 +154,7 @@
"RECIPE_PACKAGE_REPO[depot_tools]\\git.bat",
"status"
],
"cwd": "[SLAVE_BUILD]\\src",
"cwd": "[START_DIR]\\src",
"name": "git status can_fail_build"
},
{
......@@ -162,7 +162,7 @@
"RECIPE_PACKAGE_REPO[depot_tools]\\git.bat",
"status"
],
"cwd": "[SLAVE_BUILD]\\src",
"cwd": "[START_DIR]\\src",
"name": "git status cannot_fail_build"
},
{
......@@ -171,7 +171,7 @@
"new-branch",
"refactor"
],
"cwd": "[SLAVE_BUILD]\\src",
"cwd": "[START_DIR]\\src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools];%(PATH)s"
},
......@@ -185,7 +185,7 @@
"--upstream",
"refactor"
],
"cwd": "[SLAVE_BUILD]\\src",
"cwd": "[START_DIR]\\src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools];%(PATH)s"
},
......@@ -197,7 +197,7 @@
"rebase",
"origin/master"
],
"cwd": "[SLAVE_BUILD]\\src",
"cwd": "[START_DIR]\\src",
"name": "my repo rebase"
},
{
......@@ -205,10 +205,10 @@
"RECIPE_PACKAGE_REPO[depot_tools]\\git.bat",
"bundle",
"create",
"[SLAVE_BUILD]\\all.bundle",
"[START_DIR]\\all.bundle",
"--all"
],
"cwd": "[SLAVE_BUILD]\\src",
"cwd": "[START_DIR]\\src",
"name": "git bundle"
},
{
......
recipe_modules/git/example.expected/rebase_failed.json
View file @ fbf01c54
......@@ -5,7 +5,7 @@
"-u",
"RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
"--path",
"[SLAVE_BUILD]/src",
"[START_DIR]/src",
"--url",
"https://chromium.googlesource.com/chromium/src.git"
],
......@@ -20,7 +20,7 @@
"master",
"--recurse-submodules"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -33,7 +33,7 @@
"-f",
"FETCH_HEAD"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git checkout"
},
{
......@@ -42,7 +42,7 @@
"rev-parse",
"HEAD"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "read revision",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......@@ -57,7 +57,7 @@
"-d",
"-x"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git clean"
},
{
......@@ -66,7 +66,7 @@
"submodule",
"sync"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "submodule sync"
},
{
......@@ -77,7 +77,7 @@
"--init",
"--recursive"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "submodule update"
},
{
......@@ -88,7 +88,7 @@
"count-objects",
"-v"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "count-objects",
"stdout": "/path/to/tmp/"
},
......@@ -99,7 +99,7 @@
"--get",
"remote.origin.url"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git config remote.origin.url",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......@@ -114,7 +114,7 @@
"--format=%at",
"-s"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git show",
"stdout": "/path/to/tmp/"
},
......@@ -125,7 +125,7 @@
"origin",
"--tags"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git fetch tags"
},
{
......@@ -133,7 +133,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status"
},
{
......@@ -141,7 +141,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status can_fail_build"
},
{
......@@ -149,7 +149,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status cannot_fail_build"
},
{
......@@ -158,7 +158,7 @@
"new-branch",
"refactor"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -172,7 +172,7 @@
"--upstream",
"refactor"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -184,7 +184,7 @@
"rebase",
"origin/master"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "my repo rebase",
"~followup_annotations": [
"step returned non-zero exit code: 1",
......@@ -197,7 +197,7 @@
"rebase",
"--abort"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "my repo rebase abort"
},
{
......
recipe_modules/git/example.expected/remote_not_origin.json
View file @ fbf01c54
......@@ -5,7 +5,7 @@
"-u",
"RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
"--path",
"[SLAVE_BUILD]/src",
"[START_DIR]/src",
"--url",
"https://chromium.googlesource.com/chromium/src.git",
"--remote",
......@@ -22,7 +22,7 @@
"master",
"--recurse-submodules"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -35,7 +35,7 @@
"-f",
"FETCH_HEAD"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git checkout"
},
{
......@@ -44,7 +44,7 @@
"rev-parse",
"HEAD"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "read revision",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......@@ -59,7 +59,7 @@
"-d",
"-x"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git clean"
},
{
......@@ -68,7 +68,7 @@
"submodule",
"sync"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "submodule sync"
},
{
......@@ -79,7 +79,7 @@
"--init",
"--recursive"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "submodule update"
},
{
......@@ -90,7 +90,7 @@
"count-objects",
"-v"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "count-objects",
"stdout": "/path/to/tmp/"
},
......@@ -101,7 +101,7 @@
"--get",
"remote.origin.url"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git config remote.origin.url",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......@@ -116,7 +116,7 @@
"--format=%at",
"-s"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git show",
"stdout": "/path/to/tmp/"
},
......@@ -127,7 +127,7 @@
"not_origin",
"--tags"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git fetch tags"
},
{
......@@ -135,7 +135,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status"
},
{
......@@ -143,7 +143,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status can_fail_build"
},
{
......@@ -151,7 +151,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status cannot_fail_build"
},
{
......@@ -160,7 +160,7 @@
"new-branch",
"refactor"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -174,7 +174,7 @@
"--upstream",
"refactor"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -186,7 +186,7 @@
"rebase",
"not_origin/master"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "my repo rebase"
},
{
......@@ -194,10 +194,10 @@
"git",
"bundle",
"create",
"[SLAVE_BUILD]/all.bundle",
"[START_DIR]/all.bundle",
"--all"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git bundle"
},
{
......
recipe_modules/git/example.expected/set_got_revision.json
View file @ fbf01c54
......@@ -5,7 +5,7 @@
"-u",
"RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
"--path",
"[SLAVE_BUILD]/src",
"[START_DIR]/src",
"--url",
"https://chromium.googlesource.com/chromium/src.git"
],
......@@ -20,7 +20,7 @@
"master",
"--recurse-submodules"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -33,7 +33,7 @@
"-f",
"FETCH_HEAD"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git checkout"
},
{
......@@ -42,7 +42,7 @@
"rev-parse",
"HEAD"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "read revision",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......@@ -58,7 +58,7 @@
"-d",
"-x"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git clean"
},
{
......@@ -67,7 +67,7 @@
"submodule",
"sync"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "submodule sync"
},
{
......@@ -78,7 +78,7 @@
"--init",
"--recursive"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "submodule update"
},
{
......@@ -89,7 +89,7 @@
"count-objects",
"-v"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "count-objects",
"stdout": "/path/to/tmp/"
},
......@@ -100,7 +100,7 @@
"--get",
"remote.origin.url"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git config remote.origin.url",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......@@ -115,7 +115,7 @@
"--format=%at",
"-s"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git show",
"stdout": "/path/to/tmp/"
},
......@@ -126,7 +126,7 @@
"origin",
"--tags"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git fetch tags"
},
{
......@@ -134,7 +134,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status"
},
{
......@@ -142,7 +142,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status can_fail_build"
},
{
......@@ -150,7 +150,7 @@
"git",
"status"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git status cannot_fail_build"
},
{
......@@ -159,7 +159,7 @@
"new-branch",
"refactor"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -173,7 +173,7 @@
"--upstream",
"refactor"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
......@@ -185,7 +185,7 @@
"rebase",
"origin/master"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "my repo rebase"
},
{
......@@ -193,10 +193,10 @@
"git",
"bundle",
"create",
"[SLAVE_BUILD]/all.bundle",
"[START_DIR]/all.bundle",
"--all"
],
"cwd": "[SLAVE_BUILD]/src",
"cwd": "[START_DIR]/src",
"name": "git bundle"
},
{
......
recipe_modules/git/example.py
View file @ fbf01c54
......@@ -19,7 +19,7 @@ def RunSteps(api):
# useful for debugging git access issues that are reproducible only on bots.
curl_trace_file = None
if api.properties.get('use_curl_trace'):
curl_trace_file = api.path['slave_build'].join('curl_trace.log')
curl_trace_file = api.path['start_dir'].join('curl_trace.log')
submodule_update_force = api.properties.get('submodule_update_force', False)
submodule_update_recursive = api.properties.get('submodule_update_recursive',
......@@ -86,7 +86,7 @@ def RunSteps(api):
# Bundle the repository.
api.git.bundle_create(
api.path['slave_build'].join('all.bundle'))
api.path['start_dir'].join('all.bundle'))
def GenTests(api):
......
recipe_modules/infra_paths/path_config.py
View file @ fbf01c54
......@@ -14,6 +14,8 @@ def infra_common(c):
@CONFIG_CTX(includes=['infra_common'])
def infra_buildbot(c):
c.base_paths['root'] = c.START_DIR[:-4]
# slave_build is DEPRECATED in favor of start_dir
# TODO(nodir): remove it
c.base_paths['slave_build'] = c.START_DIR
c.base_paths['cache'] = c.base_paths['root'] + (
'build', 'slave', 'cache')
......@@ -28,6 +30,8 @@ def infra_buildbot(c):
@CONFIG_CTX(includes=['infra_common'])
def infra_kitchen(c):
c.base_paths['root'] = c.START_DIR
# slave_build is DEPRECATED in favor of start_dir
# TODO(nodir): remove it
c.base_paths['slave_build'] = c.START_DIR
# TODO(phajdan.jr): have one cache dir, let clients append suffixes.
......
recipe_modules/rietveld/example.expected/basic.json
View file @ fbf01c54
......@@ -5,7 +5,7 @@
"-u",
"[DEPOT_TOOLS]/apply_issue.py",
"-r",
"[SLAVE_BUILD]/foo/bar",
"[START_DIR]/foo/bar",
"-i",
"1",
"-p",
......
recipe_modules/rietveld/example.py
View file @ fbf01c54
......@@ -11,7 +11,7 @@ DEPS = [
]
def RunSteps(api):
api.path['checkout'] = api.path['slave_build']
api.path['checkout'] = api.path['start_dir']
api.rietveld.apply_issue('foo', 'bar', authentication='oauth2')
api.rietveld.calculate_issue_root({'project': ['']})
......
recipe_modules/tryserver/api.py
View file @ fbf01c54
......@@ -170,7 +170,7 @@ class TryserverApi(recipe_api.RecipeApi):
if patch_root is None:
return self._old_get_files_affected_by_patch()
if not kwargs.get('cwd'):
kwargs['cwd'] = self.m.path['slave_build'].join(patch_root)
kwargs['cwd'] = self.m.path['start_dir'].join(patch_root)
step_result = self.m.git('diff', '--cached', '--name-only',
name='git diff to analyze patch',
stdout=self.m.raw_io.output(),
......
recipe_modules/tryserver/example.expected/with_gerrit_patch.json
View file @ fbf01c54
......@@ -6,7 +6,7 @@
"--cached",
"--name-only"
],
"cwd": "[SLAVE_BUILD]",
"cwd": "[START_DIR]",
"name": "git diff to analyze patch",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......
recipe_modules/tryserver/example.expected/with_gerrit_patch_deprecated.json
View file @ fbf01c54
......@@ -6,7 +6,7 @@
"--cached",
"--name-only"
],
"cwd": "[SLAVE_BUILD]",
"cwd": "[START_DIR]",
"name": "git diff to analyze patch",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......
recipe_modules/tryserver/example.expected/with_git_patch.json
View file @ fbf01c54
......@@ -46,7 +46,7 @@
"cmd": [
"patch",
"--dir",
"[SLAVE_BUILD]",
"[START_DIR]",
"--force",
"--forward",
"--remove-empty-files",
......@@ -72,7 +72,7 @@
"--cached",
"--name-only"
],
"cwd": "[SLAVE_BUILD]/v8",
"cwd": "[START_DIR]/v8",
"name": "git diff to analyze patch",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......
recipe_modules/tryserver/example.expected/with_rietveld_patch.json
View file @ fbf01c54
......@@ -5,7 +5,7 @@
"-u",
"[DEPOT_TOOLS]/apply_issue.py",
"-r",
"[SLAVE_BUILD]",
"[START_DIR]",
"-i",
"12853011",
"-p",
......@@ -52,7 +52,7 @@
"--cached",
"--name-only"
],
"cwd": "[SLAVE_BUILD]",
"cwd": "[START_DIR]",
"name": "git diff to analyze patch",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......
recipe_modules/tryserver/example.expected/with_rietveld_patch_new.json
View file @ fbf01c54
......@@ -5,7 +5,7 @@
"-u",
"[DEPOT_TOOLS]/apply_issue.py",
"-r",
"[SLAVE_BUILD]",
"[START_DIR]",
"-i",
"12853011",
"-p",
......@@ -52,7 +52,7 @@
"--cached",
"--name-only"
],
"cwd": "[SLAVE_BUILD]/sub/project",
"cwd": "[START_DIR]/sub/project",
"name": "git diff to analyze patch",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......
recipe_modules/tryserver/example.expected/with_svn_patch.json
View file @ fbf01c54
......@@ -19,7 +19,7 @@
"cmd": [
"patch",
"--dir",
"[SLAVE_BUILD]",
"[START_DIR]",
"--force",
"--forward",
"--remove-empty-files",
......@@ -36,7 +36,7 @@
"--cached",
"--name-only"
],
"cwd": "[SLAVE_BUILD]",
"cwd": "[START_DIR]",
"name": "git diff to analyze patch",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......
recipe_modules/tryserver/example.expected/with_wrong_patch.json
View file @ fbf01c54
......@@ -17,7 +17,7 @@
"--cached",
"--name-only"
],
"cwd": "[SLAVE_BUILD]",
"cwd": "[START_DIR]",
"name": "git diff to analyze patch",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......
recipe_modules/tryserver/example.expected/with_wrong_patch_new.json
View file @ fbf01c54
......@@ -17,7 +17,7 @@
"--cached",
"--name-only"
],
"cwd": "[SLAVE_BUILD]\\sub\\project",
"cwd": "[START_DIR]\\sub\\project",
"name": "git diff to analyze patch",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
......
recipe_modules/tryserver/example.py
View file @ fbf01c54
......@@ -15,7 +15,7 @@ DEPS = [
def RunSteps(api):
api.path['checkout'] = api.path['slave_build']
api.path['checkout'] = api.path['start_dir']
if api.properties.get('patch_text'):
api.step('patch_text test', [
'echo', str(api.tryserver.get_footers(api.properties['patch_text']))])
......
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