From a7ba43a3a8d7c50d403743ee6ec5fbdcb1dbb0fc Mon Sep 17 00:00:00 2001 From: Nodir Turakulov Date: Wed, 19 Apr 2017 01:06:35 +0000 Subject: [PATCH] Revert "bot_update: pin depot_tools" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit e8acd40a11936cd5696be048da18c42622fd12aa. 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 > Commit-Queue: Nodir Turakulov > 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 Commit-Queue: Nodir Turakulov --- recipes/recipe_modules/bot_update/api.py | 2 +- recipes/recipe_modules/bot_update/example.expected/basic.json | 2 +- .../bot_update/example.expected/basic_output_manifest.json | 4 ++-- .../bot_update/example.expected/basic_with_branch_heads.json | 4 ++-- .../recipe_modules/bot_update/example.expected/buildbot.json | 2 +- .../recipe_modules/bot_update/example.expected/clobber.json | 4 ++-- .../example.expected/gerrit_no_rebase_patch_ref.json | 4 ++-- .../bot_update/example.expected/gerrit_no_reset.json | 4 ++-- .../bot_update/example.expected/no_shallow.json | 4 ++-- .../example.expected/reset_root_solution_revision.json | 4 ++-- .../recipe_modules/bot_update/example.expected/trychange.json | 4 ++-- .../example.expected/trychange_oauth2_buildbot.json | 4 ++-- .../bot_update/example.expected/trychange_oauth2_json.json | 4 ++-- .../example.expected/trychange_oauth2_json_win.json | 4 ++-- .../recipe_modules/bot_update/example.expected/tryjob.json | 4 ++-- .../bot_update/example.expected/tryjob_fail.json | 2 +- .../bot_update/example.expected/tryjob_fail_patch.json | 4 ++-- .../example.expected/tryjob_fail_patch_download.json | 4 ++-- .../bot_update/example.expected/tryjob_gerrit_angle.json | 4 ++-- .../example.expected/tryjob_gerrit_angle_deprecated.json | 4 ++-- .../recipe_modules/bot_update/example.expected/tryjob_v8.json | 4 ++-- .../example.expected/tryjob_v8_head_by_default.json | 4 ++-- .../recipe_modules/bot_update/example.expected/with_tags.json | 4 ++-- 23 files changed, 42 insertions(+), 42 deletions(-) diff --git a/recipes/recipe_modules/bot_update/api.py b/recipes/recipe_modules/bot_update/api.py index 5b1f7f978..7e1e1d6db 100644 --- a/recipes/recipe_modules/bot_update/api.py +++ b/recipes/recipe_modules/bot_update/api.py @@ -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" diff --git a/recipes/recipe_modules/bot_update/example.expected/basic.json b/recipes/recipe_modules/bot_update/example.expected/basic.json index a01c9bc51..9c076eeaf 100644 --- a/recipes/recipe_modules/bot_update/example.expected/basic.json +++ b/recipes/recipe_modules/bot_update/example.expected/basic.json @@ -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)", diff --git a/recipes/recipe_modules/bot_update/example.expected/basic_output_manifest.json b/recipes/recipe_modules/bot_update/example.expected/basic_output_manifest.json index d957562d4..7b7d8908f 100644 --- a/recipes/recipe_modules/bot_update/example.expected/basic_output_manifest.json +++ b/recipes/recipe_modules/bot_update/example.expected/basic_output_manifest.json @@ -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)", diff --git a/recipes/recipe_modules/bot_update/example.expected/basic_with_branch_heads.json b/recipes/recipe_modules/bot_update/example.expected/basic_with_branch_heads.json index 71343079a..2a795c8f6 100644 --- a/recipes/recipe_modules/bot_update/example.expected/basic_with_branch_heads.json +++ b/recipes/recipe_modules/bot_update/example.expected/basic_with_branch_heads.json @@ -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)", diff --git a/recipes/recipe_modules/bot_update/example.expected/buildbot.json b/recipes/recipe_modules/bot_update/example.expected/buildbot.json index a01c9bc51..9c076eeaf 100644 --- a/recipes/recipe_modules/bot_update/example.expected/buildbot.json +++ b/recipes/recipe_modules/bot_update/example.expected/buildbot.json @@ -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)", diff --git a/recipes/recipe_modules/bot_update/example.expected/clobber.json b/recipes/recipe_modules/bot_update/example.expected/clobber.json index a66f2dca3..7db74937e 100644 --- a/recipes/recipe_modules/bot_update/example.expected/clobber.json +++ b/recipes/recipe_modules/bot_update/example.expected/clobber.json @@ -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)", diff --git a/recipes/recipe_modules/bot_update/example.expected/gerrit_no_rebase_patch_ref.json b/recipes/recipe_modules/bot_update/example.expected/gerrit_no_rebase_patch_ref.json index e5c2f8223..5e4770e43 100644 --- a/recipes/recipe_modules/bot_update/example.expected/gerrit_no_rebase_patch_ref.json +++ b/recipes/recipe_modules/bot_update/example.expected/gerrit_no_rebase_patch_ref.json @@ -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)", diff --git a/recipes/recipe_modules/bot_update/example.expected/gerrit_no_reset.json b/recipes/recipe_modules/bot_update/example.expected/gerrit_no_reset.json index 7b0791eaa..a8f2ec7d5 100644 --- a/recipes/recipe_modules/bot_update/example.expected/gerrit_no_reset.json +++ b/recipes/recipe_modules/bot_update/example.expected/gerrit_no_reset.json @@ -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)", diff --git a/recipes/recipe_modules/bot_update/example.expected/no_shallow.json b/recipes/recipe_modules/bot_update/example.expected/no_shallow.json index ea08bada4..8fb98b0f9 100644 --- a/recipes/recipe_modules/bot_update/example.expected/no_shallow.json +++ b/recipes/recipe_modules/bot_update/example.expected/no_shallow.json @@ -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)", diff --git a/recipes/recipe_modules/bot_update/example.expected/reset_root_solution_revision.json b/recipes/recipe_modules/bot_update/example.expected/reset_root_solution_revision.json index ac6acb61a..b4e1666fc 100644 --- a/recipes/recipe_modules/bot_update/example.expected/reset_root_solution_revision.json +++ b/recipes/recipe_modules/bot_update/example.expected/reset_root_solution_revision.json @@ -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)", diff --git a/recipes/recipe_modules/bot_update/example.expected/trychange.json b/recipes/recipe_modules/bot_update/example.expected/trychange.json index bafd22e0d..e620c5aff 100644 --- a/recipes/recipe_modules/bot_update/example.expected/trychange.json +++ b/recipes/recipe_modules/bot_update/example.expected/trychange.json @@ -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)", diff --git a/recipes/recipe_modules/bot_update/example.expected/trychange_oauth2_buildbot.json b/recipes/recipe_modules/bot_update/example.expected/trychange_oauth2_buildbot.json index a169c7d44..727cbdbde 100644 --- a/recipes/recipe_modules/bot_update/example.expected/trychange_oauth2_buildbot.json +++ b/recipes/recipe_modules/bot_update/example.expected/trychange_oauth2_buildbot.json @@ -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)", diff --git a/recipes/recipe_modules/bot_update/example.expected/trychange_oauth2_json.json b/recipes/recipe_modules/bot_update/example.expected/trychange_oauth2_json.json index 265da6a04..c7f49aa33 100644 --- a/recipes/recipe_modules/bot_update/example.expected/trychange_oauth2_json.json +++ b/recipes/recipe_modules/bot_update/example.expected/trychange_oauth2_json.json @@ -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)", diff --git a/recipes/recipe_modules/bot_update/example.expected/trychange_oauth2_json_win.json b/recipes/recipe_modules/bot_update/example.expected/trychange_oauth2_json_win.json index 92eb859e5..7a2efa8e0 100644 --- a/recipes/recipe_modules/bot_update/example.expected/trychange_oauth2_json_win.json +++ b/recipes/recipe_modules/bot_update/example.expected/trychange_oauth2_json_win.json @@ -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)", diff --git a/recipes/recipe_modules/bot_update/example.expected/tryjob.json b/recipes/recipe_modules/bot_update/example.expected/tryjob.json index 7206c3525..6281b6df4 100644 --- a/recipes/recipe_modules/bot_update/example.expected/tryjob.json +++ b/recipes/recipe_modules/bot_update/example.expected/tryjob.json @@ -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)", diff --git a/recipes/recipe_modules/bot_update/example.expected/tryjob_fail.json b/recipes/recipe_modules/bot_update/example.expected/tryjob_fail.json index 5954fa49d..2e59ae9c1 100644 --- a/recipes/recipe_modules/bot_update/example.expected/tryjob_fail.json +++ b/recipes/recipe_modules/bot_update/example.expected/tryjob_fail.json @@ -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", diff --git a/recipes/recipe_modules/bot_update/example.expected/tryjob_fail_patch.json b/recipes/recipe_modules/bot_update/example.expected/tryjob_fail_patch.json index 7f24a461f..0ce9242d5 100644 --- a/recipes/recipe_modules/bot_update/example.expected/tryjob_fail_patch.json +++ b/recipes/recipe_modules/bot_update/example.expected/tryjob_fail_patch.json @@ -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)", diff --git a/recipes/recipe_modules/bot_update/example.expected/tryjob_fail_patch_download.json b/recipes/recipe_modules/bot_update/example.expected/tryjob_fail_patch_download.json index 24218886e..6e7dcfc4e 100644 --- a/recipes/recipe_modules/bot_update/example.expected/tryjob_fail_patch_download.json +++ b/recipes/recipe_modules/bot_update/example.expected/tryjob_fail_patch_download.json @@ -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)", diff --git a/recipes/recipe_modules/bot_update/example.expected/tryjob_gerrit_angle.json b/recipes/recipe_modules/bot_update/example.expected/tryjob_gerrit_angle.json index bf7c92e1a..f13a7e6b5 100644 --- a/recipes/recipe_modules/bot_update/example.expected/tryjob_gerrit_angle.json +++ b/recipes/recipe_modules/bot_update/example.expected/tryjob_gerrit_angle.json @@ -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)", diff --git a/recipes/recipe_modules/bot_update/example.expected/tryjob_gerrit_angle_deprecated.json b/recipes/recipe_modules/bot_update/example.expected/tryjob_gerrit_angle_deprecated.json index bf7c92e1a..f13a7e6b5 100644 --- a/recipes/recipe_modules/bot_update/example.expected/tryjob_gerrit_angle_deprecated.json +++ b/recipes/recipe_modules/bot_update/example.expected/tryjob_gerrit_angle_deprecated.json @@ -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)", diff --git a/recipes/recipe_modules/bot_update/example.expected/tryjob_v8.json b/recipes/recipe_modules/bot_update/example.expected/tryjob_v8.json index 9c8122719..9ec8e62e5 100644 --- a/recipes/recipe_modules/bot_update/example.expected/tryjob_v8.json +++ b/recipes/recipe_modules/bot_update/example.expected/tryjob_v8.json @@ -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)", diff --git a/recipes/recipe_modules/bot_update/example.expected/tryjob_v8_head_by_default.json b/recipes/recipe_modules/bot_update/example.expected/tryjob_v8_head_by_default.json index df85427e3..3953ba514 100644 --- a/recipes/recipe_modules/bot_update/example.expected/tryjob_v8_head_by_default.json +++ b/recipes/recipe_modules/bot_update/example.expected/tryjob_v8_head_by_default.json @@ -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)", diff --git a/recipes/recipe_modules/bot_update/example.expected/with_tags.json b/recipes/recipe_modules/bot_update/example.expected/with_tags.json index 3f1282b37..d7a2c12a9 100644 --- a/recipes/recipe_modules/bot_update/example.expected/with_tags.json +++ b/recipes/recipe_modules/bot_update/example.expected/with_tags.json @@ -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)",