bot_update: add depot_tools to PATH so that e.g. apply_issue can be found

BUG=437264

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@298556 0039d316-1c4b-4281-b951-d872f2087c98
changes/01/332501/1
phajdan.jr@chromium.org 10 years ago
parent 00f1409a81
commit c8b8c31222

@ -57,6 +57,10 @@ class BotUpdateApi(recipe_api.RecipeApi):
assert isinstance(cmd, (list, tuple)) assert isinstance(cmd, (list, tuple))
bot_update_path = self.resource('bot_update.py') bot_update_path = self.resource('bot_update.py')
kwargs.setdefault('infra_step', True) kwargs.setdefault('infra_step', True)
kwargs.setdefault('env', {})
kwargs['env'].setdefault('PATH', '%(PATH)s')
kwargs['env']['PATH'] = self.m.path.pathsep.join([
str(self._module.PACKAGE_DIRECTORY), kwargs['env']['PATH']])
return self.m.python(name, bot_update_path, cmd, **kwargs) return self.m.python(name, bot_update_path, cmd, **kwargs)
@property @property

@ -24,6 +24,9 @@
"src@abc" "src@abc"
], ],
"cwd": "[SLAVE_BUILD]", "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "RECIPE_PACKAGE[depot_tools]:%(PATH)s"
},
"name": "bot_update (without patch)", "name": "bot_update (without patch)",
"~followup_annotations": [ "~followup_annotations": [
"@@@STEP_TEXT@Some step text@@@", "@@@STEP_TEXT@Some step text@@@",

@ -25,6 +25,9 @@
"--output_manifest" "--output_manifest"
], ],
"cwd": "[SLAVE_BUILD]", "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "RECIPE_PACKAGE[depot_tools]:%(PATH)s"
},
"name": "bot_update", "name": "bot_update",
"~followup_annotations": [ "~followup_annotations": [
"@@@STEP_TEXT@Some step text@@@", "@@@STEP_TEXT@Some step text@@@",

@ -25,6 +25,9 @@
"--with_branch_heads" "--with_branch_heads"
], ],
"cwd": "[SLAVE_BUILD]", "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "RECIPE_PACKAGE[depot_tools]:%(PATH)s"
},
"name": "bot_update - with branch heads", "name": "bot_update - with branch heads",
"~followup_annotations": [ "~followup_annotations": [
"@@@STEP_TEXT@Some step text@@@", "@@@STEP_TEXT@Some step text@@@",

@ -25,6 +25,9 @@
"--clobber" "--clobber"
], ],
"cwd": "[SLAVE_BUILD]", "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "RECIPE_PACKAGE[depot_tools]:%(PATH)s"
},
"name": "bot_update", "name": "bot_update",
"~followup_annotations": [ "~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@", "@@@STEP_LOG_LINE@json.output@{@@@",

@ -25,6 +25,9 @@
"--force" "--force"
], ],
"cwd": "[SLAVE_BUILD]", "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "RECIPE_PACKAGE[depot_tools]:%(PATH)s"
},
"name": "bot_update", "name": "bot_update",
"~followup_annotations": [ "~followup_annotations": [
"@@@STEP_TEXT@Some step text@@@", "@@@STEP_TEXT@Some step text@@@",

@ -25,6 +25,9 @@
"--no_shallow" "--no_shallow"
], ],
"cwd": "[SLAVE_BUILD]", "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "RECIPE_PACKAGE[depot_tools]:%(PATH)s"
},
"name": "bot_update", "name": "bot_update",
"~followup_annotations": [ "~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@", "@@@STEP_LOG_LINE@json.output@{@@@",

@ -24,6 +24,9 @@
"src@HEAD" "src@HEAD"
], ],
"cwd": "[SLAVE_BUILD]", "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "RECIPE_PACKAGE[depot_tools]:%(PATH)s"
},
"name": "bot_update", "name": "bot_update",
"~followup_annotations": [ "~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@", "@@@STEP_LOG_LINE@json.output@{@@@",

@ -24,6 +24,9 @@
"src@revision" "src@revision"
], ],
"cwd": "[SLAVE_BUILD]", "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "RECIPE_PACKAGE[depot_tools]:%(PATH)s"
},
"name": "bot_update", "name": "bot_update",
"~followup_annotations": [ "~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@", "@@@STEP_LOG_LINE@json.output@{@@@",

@ -25,6 +25,9 @@
"--force" "--force"
], ],
"cwd": "[SLAVE_BUILD]", "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "RECIPE_PACKAGE[depot_tools]:%(PATH)s"
},
"name": "bot_update", "name": "bot_update",
"~followup_annotations": [ "~followup_annotations": [
"@@@STEP_TEXT@Some step text@@@", "@@@STEP_TEXT@Some step text@@@",

@ -26,6 +26,9 @@
"+refs/change/1/2/333" "+refs/change/1/2/333"
], ],
"cwd": "[SLAVE_BUILD]", "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "RECIPE_PACKAGE[depot_tools]:%(PATH)s"
},
"name": "bot_update", "name": "bot_update",
"~followup_annotations": [ "~followup_annotations": [
"@@@STEP_TEXT@Some step text@@@", "@@@STEP_TEXT@Some step text@@@",

@ -28,6 +28,9 @@
"src@HEAD" "src@HEAD"
], ],
"cwd": "[SLAVE_BUILD]", "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "RECIPE_PACKAGE[depot_tools]:%(PATH)s"
},
"name": "bot_update", "name": "bot_update",
"~followup_annotations": [ "~followup_annotations": [
"@@@STEP_TEXT@Some step text@@@", "@@@STEP_TEXT@Some step text@@@",

@ -26,6 +26,9 @@
"src@HEAD" "src@HEAD"
], ],
"cwd": "[SLAVE_BUILD]", "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "RECIPE_PACKAGE[depot_tools]:%(PATH)s"
},
"name": "bot_update", "name": "bot_update",
"~followup_annotations": [ "~followup_annotations": [
"@@@STEP_TEXT@Some step text@@@", "@@@STEP_TEXT@Some step text@@@",

@ -26,6 +26,9 @@
"src@HEAD" "src@HEAD"
], ],
"cwd": "[SLAVE_BUILD]", "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "RECIPE_PACKAGE[depot_tools]:%(PATH)s"
},
"name": "bot_update", "name": "bot_update",
"~followup_annotations": [ "~followup_annotations": [
"step returned non-zero exit code: 1", "step returned non-zero exit code: 1",

@ -26,6 +26,9 @@
"src@HEAD" "src@HEAD"
], ],
"cwd": "[SLAVE_BUILD]", "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "RECIPE_PACKAGE[depot_tools]:%(PATH)s"
},
"name": "bot_update", "name": "bot_update",
"~followup_annotations": [ "~followup_annotations": [
"@@@STEP_TEXT@Some step text@@@", "@@@STEP_TEXT@Some step text@@@",

@ -26,6 +26,9 @@
"src@HEAD" "src@HEAD"
], ],
"cwd": "[SLAVE_BUILD]", "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "RECIPE_PACKAGE[depot_tools]:%(PATH)s"
},
"name": "bot_update", "name": "bot_update",
"~followup_annotations": [ "~followup_annotations": [
"@@@STEP_TEXT@Some step text@@@", "@@@STEP_TEXT@Some step text@@@",

@ -28,6 +28,9 @@
"src/v8@abc" "src/v8@abc"
], ],
"cwd": "[SLAVE_BUILD]", "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "RECIPE_PACKAGE[depot_tools]:%(PATH)s"
},
"name": "bot_update", "name": "bot_update",
"~followup_annotations": [ "~followup_annotations": [
"@@@STEP_TEXT@Some step text@@@", "@@@STEP_TEXT@Some step text@@@",

Loading…
Cancel
Save