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

Revert of bot_update: add depot_tools to PATH so that e.g. apply_issue can be found (patchset #1 id:1 of https://codereview.chromium.org/1660943002/ )

Reason for revert:
I believe this breaks trybot patching on Windows. 

Example: https://build.chromium.org/p/tryserver.webrtc/builders/win_x64_gn_rel/builds/6811

Error: 
'E:\b\build\scripts\slave\.recipe_deps\depot_tools\python' is not recognized as an internal or external command,
operable program or batch file.

I'm speculatively reverting.

Original issue's description:
> bot_update: add depot_tools to PATH so that e.g. apply_issue can be found
> 
> BUG=437264
> 
> Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=298556

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

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@298561 0039d316-1c4b-4281-b951-d872f2087c98
parent a1798215
...@@ -57,10 +57,6 @@ class BotUpdateApi(recipe_api.RecipeApi): ...@@ -57,10 +57,6 @@ 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,9 +24,6 @@ ...@@ -24,9 +24,6 @@
"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,9 +25,6 @@ ...@@ -25,9 +25,6 @@
"--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,9 +25,6 @@ ...@@ -25,9 +25,6 @@
"--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,9 +25,6 @@ ...@@ -25,9 +25,6 @@
"--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,9 +25,6 @@ ...@@ -25,9 +25,6 @@
"--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,9 +25,6 @@ ...@@ -25,9 +25,6 @@
"--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,9 +24,6 @@ ...@@ -24,9 +24,6 @@
"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,9 +24,6 @@ ...@@ -24,9 +24,6 @@
"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,9 +25,6 @@ ...@@ -25,9 +25,6 @@
"--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,9 +26,6 @@ ...@@ -26,9 +26,6 @@
"+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,9 +28,6 @@ ...@@ -28,9 +28,6 @@
"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,9 +26,6 @@ ...@@ -26,9 +26,6 @@
"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,9 +26,6 @@ ...@@ -26,9 +26,6 @@
"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,9 +26,6 @@ ...@@ -26,9 +26,6 @@
"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,9 +26,6 @@ ...@@ -26,9 +26,6 @@
"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,9 +28,6 @@ ...@@ -28,9 +28,6 @@
"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@@@",
......
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