aiden
/
depot_tools
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "bot_update: pin depot_tools"

Browse Source 
This reverts commit e8acd40a11.

Reason for revert: broke windows builds :(

Original change's description:
> bot_update: pin depot_tools
> 
> gclient runhooks often calls scripts that depend on scripts in depot_tools.
> Currently bot_update only ensures that depot_tools is present in $PATH, but
> otherwise uses whatever depot_tools already specified in $PATH. We don't pin
> depot_tools before running a recipe, so using whatever depot_tools in $PATH
> is not hermetic.
> 
> Insert the path to the pinned depot_tools to the beginning of $PATH
> 
> R=​iannucci@chromium.org
> 
> Bug:
> 
> Change-Id: I31d04ba2ec7c409f89d58a51502ce3565e3a02a1
> Reviewed-on: https://chromium-review.googlesource.com/481072
> Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
> Commit-Queue: Nodir Turakulov <nodir@chromium.org>
> 

TBR=iannucci@chromium.org,nodir@chromium.org,phajdan.jr@chromium.org,chromium-reviews@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Change-Id: I1a70f0f54e9b9cea7fc2f9897e62f558204a4684
Reviewed-on: https://chromium-review.googlesource.com/481440
Reviewed-by: Nodir Turakulov <nodir@chromium.org>
Commit-Queue: Nodir Turakulov <nodir@chromium.org>
changes/40/481440/2
Nodir Turakulov 8 years ago committed by Commit Bot
parent 100aa213c6
commit a7ba43a3a8
23 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File

2
recipes/recipe_modules/bot_update/api.py
Unescape Escape View File

@ -36,7 +36,7 @@ class BotUpdateApi(recipe_api.RecipeApi):
env = self.m.step.get_from_context('env', {})
env.setdefault('PATH', '%(PATH)s')
env['PATH'] = self.m.path.pathsep.join([
str(self._module.PACKAGE_REPO_ROOT), env['PATH']])
env['PATH'], str(self._module.PACKAGE_REPO_ROOT)])
# These are to prevent git from hanging. If the git connection is slower
# than 1KB/s for more than 5 minutes then git will kill the connection
# and die with an error "error: RPC failed; curl 28 Operation too slow"

2
recipes/recipe_modules/bot_update/example.expected/basic.json
Unescape Escape View File

@ -20,7 +20,7 @@
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
"name": "bot_update (without patch)",

4
recipes/recipe_modules/bot_update/example.expected/basic_output_manifest.json
Unescape Escape View File

@ -21,7 +21,7 @@
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
"name": "bot_update",
@ -74,7 +74,7 @@
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
"name": "bot_update (without patch)",

4
recipes/recipe_modules/bot_update/example.expected/basic_with_branch_heads.json
Unescape Escape View File

@ -21,7 +21,7 @@
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
"name": "bot_update - with branch heads",
@ -68,7 +68,7 @@
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
"name": "bot_update (without patch)",

2
recipes/recipe_modules/bot_update/example.expected/buildbot.json
Unescape Escape View File

@ -20,7 +20,7 @@
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
"name": "bot_update (without patch)",

4
recipes/recipe_modules/bot_update/example.expected/clobber.json
Unescape Escape View File

@ -21,7 +21,7 @@
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
"name": "bot_update",
@ -68,7 +68,7 @@
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
"name": "bot_update (without patch)",

4
recipes/recipe_modules/bot_update/example.expected/gerrit_no_rebase_patch_ref.json
Unescape Escape View File

@ -21,7 +21,7 @@
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
"name": "bot_update",
@ -68,7 +68,7 @@
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
"name": "bot_update (without patch)",

4
recipes/recipe_modules/bot_update/example.expected/gerrit_no_reset.json
Unescape Escape View File

@ -21,7 +21,7 @@
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
"name": "bot_update",
@ -68,7 +68,7 @@
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
"name": "bot_update (without patch)",

4
recipes/recipe_modules/bot_update/example.expected/no_shallow.json
Unescape Escape View File

@ -21,7 +21,7 @@
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
"name": "bot_update",
@ -68,7 +68,7 @@
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
"name": "bot_update (without patch)",

4
recipes/recipe_modules/bot_update/example.expected/reset_root_solution_revision.json
Unescape Escape View File

@ -20,7 +20,7 @@
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
"name": "bot_update",
@ -67,7 +67,7 @@
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
"name": "bot_update (without patch)",

4
recipes/recipe_modules/bot_update/example.expected/trychange.json
Unescape Escape View File

@ -22,7 +22,7 @@
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
"name": "bot_update",
@ -69,7 +69,7 @@
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
"name": "bot_update (without patch)",

4
recipes/recipe_modules/bot_update/example.expected/trychange_oauth2_buildbot.json
Unescape Escape View File

@ -24,7 +24,7 @@
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
"name": "bot_update",
@ -71,7 +71,7 @@
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
"name": "bot_update (without patch)",

4
recipes/recipe_modules/bot_update/example.expected/trychange_oauth2_json.json
Unescape Escape View File

@ -22,7 +22,7 @@
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
"name": "bot_update",
@ -69,7 +69,7 @@
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
"name": "bot_update (without patch)",

4
recipes/recipe_modules/bot_update/example.expected/trychange_oauth2_json_win.json
Unescape Escape View File

@ -22,7 +22,7 @@
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "RECIPE_PACKAGE_REPO[depot_tools];%(PATH)s"
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
"name": "bot_update",
@ -69,7 +69,7 @@
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "RECIPE_PACKAGE_REPO[depot_tools];%(PATH)s"
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
"name": "bot_update (without patch)",

4
recipes/recipe_modules/bot_update/example.expected/tryjob.json
Unescape Escape View File

@ -26,7 +26,7 @@
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
"name": "bot_update",
@ -75,7 +75,7 @@
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
"name": "bot_update (without patch)",

2
recipes/recipe_modules/bot_update/example.expected/tryjob_fail.json
Unescape Escape View File

@ -26,7 +26,7 @@
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
"name": "bot_update",

4
recipes/recipe_modules/bot_update/example.expected/tryjob_fail_patch.json
Unescape Escape View File

@ -26,7 +26,7 @@
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
"name": "bot_update",
@ -104,7 +104,7 @@
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
"name": "bot_update (without patch)",

4
recipes/recipe_modules/bot_update/example.expected/tryjob_fail_patch_download.json
Unescape Escape View File

@ -26,7 +26,7 @@
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
"name": "bot_update",
@ -104,7 +104,7 @@
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
"name": "bot_update (without patch)",

4
recipes/recipe_modules/bot_update/example.expected/tryjob_gerrit_angle.json
Unescape Escape View File

@ -26,7 +26,7 @@
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
"name": "bot_update",
@ -76,7 +76,7 @@
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
"name": "bot_update (without patch)",

4
recipes/recipe_modules/bot_update/example.expected/tryjob_gerrit_angle_deprecated.json
Unescape Escape View File

@ -26,7 +26,7 @@
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
"name": "bot_update",
@ -76,7 +76,7 @@
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
"name": "bot_update (without patch)",

4
recipes/recipe_modules/bot_update/example.expected/tryjob_v8.json
Unescape Escape View File

@ -28,7 +28,7 @@
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
"name": "bot_update",
@ -80,7 +80,7 @@
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
"name": "bot_update (without patch)",

4
recipes/recipe_modules/bot_update/example.expected/tryjob_v8_head_by_default.json
Unescape Escape View File

@ -28,7 +28,7 @@
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
"name": "bot_update",
@ -80,7 +80,7 @@
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
"name": "bot_update (without patch)",

4
recipes/recipe_modules/bot_update/example.expected/with_tags.json
Unescape Escape View File

@ -21,7 +21,7 @@
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
"name": "bot_update",
@ -68,7 +68,7 @@
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
"name": "bot_update (without patch)",

Write Preview
Loading…
Cancel
Save