Skip to content

C
Chromium_Depot_tools
Commit fc064509 authored by kjellander@chromium.org's avatar kjellander@chromium.org
Browse files
Options

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
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 52 deletions
recipe_modules/bot_update/api.py
View file @ fc064509
......@@ -57,10 +57,6 @@ class BotUpdateApi(recipe_api.RecipeApi):
assert isinstance(cmd, (list, tuple))
bot_update_path = self.resource('bot_update.py')
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)
@property
......
recipe_modules/bot_update/example.expected/basic.json
View file @ fc064509
......@@ -24,9 +24,6 @@
"src@abc"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "RECIPE_PACKAGE[depot_tools]:%(PATH)s"
},
"name": "bot_update (without patch)",
"~followup_annotations": [
"@@@STEP_TEXT@Some step text@@@",
......
recipe_modules/bot_update/example.expected/basic_output_manifest.json
View file @ fc064509
......@@ -25,9 +25,6 @@
"--output_manifest"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "RECIPE_PACKAGE[depot_tools]:%(PATH)s"
},
"name": "bot_update",
"~followup_annotations": [
"@@@STEP_TEXT@Some step text@@@",
......
recipe_modules/bot_update/example.expected/basic_with_branch_heads.json
View file @ fc064509
......@@ -25,9 +25,6 @@
"--with_branch_heads"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "RECIPE_PACKAGE[depot_tools]:%(PATH)s"
},
"name": "bot_update - with branch heads",
"~followup_annotations": [
"@@@STEP_TEXT@Some step text@@@",
......
recipe_modules/bot_update/example.expected/clobber.json
View file @ fc064509
......@@ -25,9 +25,6 @@
"--clobber"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "RECIPE_PACKAGE[depot_tools]:%(PATH)s"
},
"name": "bot_update",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
......
recipe_modules/bot_update/example.expected/forced.json
View file @ fc064509
......@@ -25,9 +25,6 @@
"--force"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "RECIPE_PACKAGE[depot_tools]:%(PATH)s"
},
"name": "bot_update",
"~followup_annotations": [
"@@@STEP_TEXT@Some step text@@@",
......
recipe_modules/bot_update/example.expected/no_shallow.json
View file @ fc064509
......@@ -25,9 +25,6 @@
"--no_shallow"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "RECIPE_PACKAGE[depot_tools]:%(PATH)s"
},
"name": "bot_update",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
......
recipe_modules/bot_update/example.expected/off.json
View file @ fc064509
......@@ -24,9 +24,6 @@
"src@HEAD"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "RECIPE_PACKAGE[depot_tools]:%(PATH)s"
},
"name": "bot_update",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
......
recipe_modules/bot_update/example.expected/reset_root_solution_revision.json
View file @ fc064509
......@@ -24,9 +24,6 @@
"src@revision"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "RECIPE_PACKAGE[depot_tools]:%(PATH)s"
},
"name": "bot_update",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
......
recipe_modules/bot_update/example.expected/svn_mode.json
View file @ fc064509
......@@ -25,9 +25,6 @@
"--force"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "RECIPE_PACKAGE[depot_tools]:%(PATH)s"
},
"name": "bot_update",
"~followup_annotations": [
"@@@STEP_TEXT@Some step text@@@",
......
recipe_modules/bot_update/example.expected/trychange.json
View file @ fc064509
......@@ -26,9 +26,6 @@
"+refs/change/1/2/333"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "RECIPE_PACKAGE[depot_tools]:%(PATH)s"
},
"name": "bot_update",
"~followup_annotations": [
"@@@STEP_TEXT@Some step text@@@",
......
recipe_modules/bot_update/example.expected/trychange_oauth2.json
View file @ fc064509
......@@ -28,9 +28,6 @@
"src@HEAD"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "RECIPE_PACKAGE[depot_tools]:%(PATH)s"
},
"name": "bot_update",
"~followup_annotations": [
"@@@STEP_TEXT@Some step text@@@",
......
recipe_modules/bot_update/example.expected/tryjob.json
View file @ fc064509
......@@ -26,9 +26,6 @@
"src@HEAD"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "RECIPE_PACKAGE[depot_tools]:%(PATH)s"
},
"name": "bot_update",
"~followup_annotations": [
"@@@STEP_TEXT@Some step text@@@",
......
recipe_modules/bot_update/example.expected/tryjob_fail.json
View file @ fc064509
......@@ -26,9 +26,6 @@
"src@HEAD"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "RECIPE_PACKAGE[depot_tools]:%(PATH)s"
},
"name": "bot_update",
"~followup_annotations": [
"step returned non-zero exit code: 1",
......
recipe_modules/bot_update/example.expected/tryjob_fail_patch.json
View file @ fc064509
......@@ -26,9 +26,6 @@
"src@HEAD"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "RECIPE_PACKAGE[depot_tools]:%(PATH)s"
},
"name": "bot_update",
"~followup_annotations": [
"@@@STEP_TEXT@Some step text@@@",
......
recipe_modules/bot_update/example.expected/tryjob_fail_patch_download.json
View file @ fc064509
......@@ -26,9 +26,6 @@
"src@HEAD"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "RECIPE_PACKAGE[depot_tools]:%(PATH)s"
},
"name": "bot_update",
"~followup_annotations": [
"@@@STEP_TEXT@Some step text@@@",
......
recipe_modules/bot_update/example.expected/tryjob_v8.json
View file @ fc064509
......@@ -28,9 +28,6 @@
"src/v8@abc"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "RECIPE_PACKAGE[depot_tools]:%(PATH)s"
},
"name": "bot_update",
"~followup_annotations": [
"@@@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