From fc064509b0264587d6b90d6c646b323df27ceec9 Mon Sep 17 00:00:00 2001 From: "kjellander@chromium.org" Date: Wed, 3 Feb 2016 15:34:11 +0000 Subject: [PATCH] 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 --- recipe_modules/bot_update/api.py | 4 ---- recipe_modules/bot_update/example.expected/basic.json | 3 --- .../bot_update/example.expected/basic_output_manifest.json | 3 --- .../bot_update/example.expected/basic_with_branch_heads.json | 3 --- recipe_modules/bot_update/example.expected/clobber.json | 3 --- recipe_modules/bot_update/example.expected/forced.json | 3 --- recipe_modules/bot_update/example.expected/no_shallow.json | 3 --- recipe_modules/bot_update/example.expected/off.json | 3 --- .../example.expected/reset_root_solution_revision.json | 3 --- recipe_modules/bot_update/example.expected/svn_mode.json | 3 --- recipe_modules/bot_update/example.expected/trychange.json | 3 --- .../bot_update/example.expected/trychange_oauth2.json | 3 --- recipe_modules/bot_update/example.expected/tryjob.json | 3 --- recipe_modules/bot_update/example.expected/tryjob_fail.json | 3 --- .../bot_update/example.expected/tryjob_fail_patch.json | 3 --- .../example.expected/tryjob_fail_patch_download.json | 3 --- recipe_modules/bot_update/example.expected/tryjob_v8.json | 3 --- 17 files changed, 52 deletions(-) diff --git a/recipe_modules/bot_update/api.py b/recipe_modules/bot_update/api.py index 2370c7a6e..c077ae904 100644 --- a/recipe_modules/bot_update/api.py +++ b/recipe_modules/bot_update/api.py @@ -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 diff --git a/recipe_modules/bot_update/example.expected/basic.json b/recipe_modules/bot_update/example.expected/basic.json index 2a4e25566..a21bd91dd 100644 --- a/recipe_modules/bot_update/example.expected/basic.json +++ b/recipe_modules/bot_update/example.expected/basic.json @@ -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@@@", diff --git a/recipe_modules/bot_update/example.expected/basic_output_manifest.json b/recipe_modules/bot_update/example.expected/basic_output_manifest.json index bccf537f1..8521bf0e6 100644 --- a/recipe_modules/bot_update/example.expected/basic_output_manifest.json +++ b/recipe_modules/bot_update/example.expected/basic_output_manifest.json @@ -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@@@", diff --git a/recipe_modules/bot_update/example.expected/basic_with_branch_heads.json b/recipe_modules/bot_update/example.expected/basic_with_branch_heads.json index b9a62e3bb..0275a7c6a 100644 --- a/recipe_modules/bot_update/example.expected/basic_with_branch_heads.json +++ b/recipe_modules/bot_update/example.expected/basic_with_branch_heads.json @@ -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@@@", diff --git a/recipe_modules/bot_update/example.expected/clobber.json b/recipe_modules/bot_update/example.expected/clobber.json index e071cd28a..3650c6e66 100644 --- a/recipe_modules/bot_update/example.expected/clobber.json +++ b/recipe_modules/bot_update/example.expected/clobber.json @@ -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@{@@@", diff --git a/recipe_modules/bot_update/example.expected/forced.json b/recipe_modules/bot_update/example.expected/forced.json index 31112d9f9..ca3ef96b0 100644 --- a/recipe_modules/bot_update/example.expected/forced.json +++ b/recipe_modules/bot_update/example.expected/forced.json @@ -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@@@", diff --git a/recipe_modules/bot_update/example.expected/no_shallow.json b/recipe_modules/bot_update/example.expected/no_shallow.json index 693ba0ee0..3cb8fdf3f 100644 --- a/recipe_modules/bot_update/example.expected/no_shallow.json +++ b/recipe_modules/bot_update/example.expected/no_shallow.json @@ -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@{@@@", diff --git a/recipe_modules/bot_update/example.expected/off.json b/recipe_modules/bot_update/example.expected/off.json index 35d38b244..bc645fa1d 100644 --- a/recipe_modules/bot_update/example.expected/off.json +++ b/recipe_modules/bot_update/example.expected/off.json @@ -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@{@@@", diff --git a/recipe_modules/bot_update/example.expected/reset_root_solution_revision.json b/recipe_modules/bot_update/example.expected/reset_root_solution_revision.json index f4f7fbf96..5d2d3d95d 100644 --- a/recipe_modules/bot_update/example.expected/reset_root_solution_revision.json +++ b/recipe_modules/bot_update/example.expected/reset_root_solution_revision.json @@ -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@{@@@", diff --git a/recipe_modules/bot_update/example.expected/svn_mode.json b/recipe_modules/bot_update/example.expected/svn_mode.json index 0c0698448..2f61227ea 100644 --- a/recipe_modules/bot_update/example.expected/svn_mode.json +++ b/recipe_modules/bot_update/example.expected/svn_mode.json @@ -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@@@", diff --git a/recipe_modules/bot_update/example.expected/trychange.json b/recipe_modules/bot_update/example.expected/trychange.json index 1b9ff3c2c..26cdf6445 100644 --- a/recipe_modules/bot_update/example.expected/trychange.json +++ b/recipe_modules/bot_update/example.expected/trychange.json @@ -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@@@", diff --git a/recipe_modules/bot_update/example.expected/trychange_oauth2.json b/recipe_modules/bot_update/example.expected/trychange_oauth2.json index af0cd63ff..a9788dc60 100644 --- a/recipe_modules/bot_update/example.expected/trychange_oauth2.json +++ b/recipe_modules/bot_update/example.expected/trychange_oauth2.json @@ -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@@@", diff --git a/recipe_modules/bot_update/example.expected/tryjob.json b/recipe_modules/bot_update/example.expected/tryjob.json index 22777e487..9725c2cd1 100644 --- a/recipe_modules/bot_update/example.expected/tryjob.json +++ b/recipe_modules/bot_update/example.expected/tryjob.json @@ -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@@@", diff --git a/recipe_modules/bot_update/example.expected/tryjob_fail.json b/recipe_modules/bot_update/example.expected/tryjob_fail.json index c43856598..252ef7c59 100644 --- a/recipe_modules/bot_update/example.expected/tryjob_fail.json +++ b/recipe_modules/bot_update/example.expected/tryjob_fail.json @@ -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", diff --git a/recipe_modules/bot_update/example.expected/tryjob_fail_patch.json b/recipe_modules/bot_update/example.expected/tryjob_fail_patch.json index 04ccae98f..0b968135a 100644 --- a/recipe_modules/bot_update/example.expected/tryjob_fail_patch.json +++ b/recipe_modules/bot_update/example.expected/tryjob_fail_patch.json @@ -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@@@", diff --git a/recipe_modules/bot_update/example.expected/tryjob_fail_patch_download.json b/recipe_modules/bot_update/example.expected/tryjob_fail_patch_download.json index 77e0854c1..88da29c2f 100644 --- a/recipe_modules/bot_update/example.expected/tryjob_fail_patch_download.json +++ b/recipe_modules/bot_update/example.expected/tryjob_fail_patch_download.json @@ -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@@@", diff --git a/recipe_modules/bot_update/example.expected/tryjob_v8.json b/recipe_modules/bot_update/example.expected/tryjob_v8.json index eee4ad044..8017c26dd 100644 --- a/recipe_modules/bot_update/example.expected/tryjob_v8.json +++ b/recipe_modules/bot_update/example.expected/tryjob_v8.json @@ -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@@@",