[bot_update] Prefix PATH, cleanup.

Prefix "depot_tools" to PATH instead of appending. This will ensure that "depot_tools" pulls resources from the recipe checkout as a preference, not as a last resort. Use "env_prefixes" instead of "env" to prefix PATH. Remove Git speed limit settings, which are taken care of by the Git wrapper now. BUG=chromium:738176 TEST=expectations R=hinoka@chromium.org, iannucci@chromium.org Change-Id: I2e509a331266e867be323bc70e3bc0f08f85246f Reviewed-on: https://chromium-review.googlesource.com/556287Reviewed-by: Ryan Tseng <hinoka@chromium.org> Commit-Queue: Daniel Jacques <dnj@chromium.org>

[bot_update] Prefix PATH, cleanup.
Prefix "depot_tools" to PATH instead of appending. This will ensure that "depot_tools" pulls resources from the recipe checkout as a preference, not as a last resort. Use "env_prefixes" instead of "env" to prefix PATH. Remove Git speed limit settings, which are taken care of by the Git wrapper now. BUG=chromium:738176 TEST=expectations R=hinoka@chromium.org, iannucci@chromium.org Change-Id: I2e509a331266e867be323bc70e3bc0f08f85246f Reviewed-on: https://chromium-review.googlesource.com/556287Reviewed-by: Ryan Tseng <hinoka@chromium.org> Commit-Queue: Daniel Jacques <dnj@chromium.org>
dc598e82 · Dan Jacques · Commit Bot · 897bf0b0 · dc598e82 · dc598e82
Commit dc598e82 authored Jun 29, 2017 by Dan Jacques Committed by Commit Bot Jun 29, 2017
29 changed files
--- a/recipes/recipe_modules/bot_update/__init__.py
+++ b/recipes/recipe_modules/bot_update/__init__.py
 DEPS = [
+  'depot_tools',
  'gclient',
  'recipe_engine/context',
  'recipe_engine/json',

--- a/recipes/recipe_modules/bot_update/api.py
+++ b/recipes/recipe_modules/bot_update/api.py
@@ -33,16 +33,11 @@ class BotUpdateApi(recipe_api.RecipeApi):
    assert isinstance(cmd, (list, tuple))
    bot_update_path = self.resource('bot_update.py')
    kwargs.setdefault('infra_step', True)
-    env = self.m.context.env
-    env.setdefault('PATH', '%(PATH)s')
-    env['PATH'] = self.m.path.pathsep.join([
-        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"
-    env['GIT_HTTP_LOW_SPEED_LIMIT'] = 1000
-    env['GIT_HTTP_LOW_SPEED_TIME'] = 300
-    with self.m.context(env=env):
+
+    env_prefixes = {
+        'PATH': [self.m.depot_tools.root],
+    }
+    with self.m.context(env_prefixes=env_prefixes):
      return self.m.python(name, bot_update_path, cmd, **kwargs)

  @property
@@ -55,10 +50,6 @@ class BotUpdateApi(recipe_api.RecipeApi):
                       gerrit_no_rebase_patch_ref=False, **kwargs):
    apply_gerrit_path = self.resource('apply_gerrit.py')
    kwargs.setdefault('infra_step', True)
-    env = self.m.context.env
-    env.setdefault('PATH', '%(PATH)s')
-    env['PATH'] = self.m.path.pathsep.join([
-        env['PATH'], str(self._module.PACKAGE_REPO_ROOT)])
    cmd = [
        '--gerrit_repo', self._repository,
        '--gerrit_ref', self._gerrit_ref or '',
@@ -68,7 +59,11 @@ class BotUpdateApi(recipe_api.RecipeApi):
      cmd.append('--gerrit_no_reset')
    if gerrit_no_rebase_patch_ref:
      cmd.append('--gerrit_no_rebase_patch_ref')
-    with self.m.context(env=env):
+
+    env_prefixes = {
+        'PATH': [self.m.depot_tools.root],
+    }
+    with self.m.context(env_prefixes=env_prefixes):
      return self.m.python('apply_gerrit', apply_gerrit_path, cmd, **kwargs)

  def ensure_checkout(self, gclient_config=None, suffix=None,

--- a/recipes/recipe_modules/bot_update/examples/full.expected/apply_gerrit_ref.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/apply_gerrit_ref.json
@@ -13,8 +13,10 @@
      "--gerrit_no_reset",
      "--gerrit_no_rebase_patch_ref"
    ],
-    "env": {
-      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    "env_prefixes": {
+      "PATH": [
+        "RECIPE_PACKAGE_REPO[depot_tools]"
+      ]
    },
    "infra_step": true,
    "name": "apply_gerrit"

--- a/recipes/recipe_modules/bot_update/examples/full.expected/basic.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/basic.json
@@ -20,10 +20,10 @@
      "src@abc",
      "--disable-syntax-validation"
    ],
-    "env": {
-      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
-      "GIT_HTTP_LOW_SPEED_TIME": "300",
-      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    "env_prefixes": {
+      "PATH": [
+        "RECIPE_PACKAGE_REPO[depot_tools]"
+      ]
    },
    "infra_step": true,
    "name": "bot_update (without patch)",

--- a/recipes/recipe_modules/bot_update/examples/full.expected/basic_with_branch_heads.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/basic_with_branch_heads.json
@@ -21,10 +21,10 @@
      "--with_branch_heads",
      "--disable-syntax-validation"
    ],
-    "env": {
-      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
-      "GIT_HTTP_LOW_SPEED_TIME": "300",
-      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    "env_prefixes": {
+      "PATH": [
+        "RECIPE_PACKAGE_REPO[depot_tools]"
+      ]
    },
    "infra_step": true,
    "name": "bot_update - with branch heads",
@@ -79,10 +79,10 @@
      "--revision",
      "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9"
    ],
-    "env": {
-      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
-      "GIT_HTTP_LOW_SPEED_TIME": "300",
-      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    "env_prefixes": {
+      "PATH": [
+        "RECIPE_PACKAGE_REPO[depot_tools]"
+      ]
    },
    "infra_step": true,
    "name": "bot_update (without patch)",

--- a/recipes/recipe_modules/bot_update/examples/full.expected/buildbot.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/buildbot.json
@@ -20,10 +20,10 @@
      "src@abc",
      "--disable-syntax-validation"
    ],
-    "env": {
-      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
-      "GIT_HTTP_LOW_SPEED_TIME": "300",
-      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    "env_prefixes": {
+      "PATH": [
+        "RECIPE_PACKAGE_REPO[depot_tools]"
+      ]
    },
    "infra_step": true,
    "name": "bot_update (without patch)",

--- a/recipes/recipe_modules/bot_update/examples/full.expected/clobber.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/clobber.json
@@ -21,10 +21,10 @@
      "--clobber",
      "--disable-syntax-validation"
    ],
-    "env": {
-      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
-      "GIT_HTTP_LOW_SPEED_TIME": "300",
-      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    "env_prefixes": {
+      "PATH": [
+        "RECIPE_PACKAGE_REPO[depot_tools]"
+      ]
    },
    "infra_step": true,
    "name": "bot_update",
@@ -79,10 +79,10 @@
      "--revision",
      "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9"
    ],
-    "env": {
-      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
-      "GIT_HTTP_LOW_SPEED_TIME": "300",
-      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    "env_prefixes": {
+      "PATH": [
+        "RECIPE_PACKAGE_REPO[depot_tools]"
+      ]
    },
    "infra_step": true,
    "name": "bot_update (without patch)",

--- a/recipes/recipe_modules/bot_update/examples/full.expected/deprecated_got_revision_mapping.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/deprecated_got_revision_mapping.json
@@ -26,10 +26,10 @@
      "src@HEAD",
      "--disable-syntax-validation"
    ],
-    "env": {
-      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
-      "GIT_HTTP_LOW_SPEED_TIME": "300",
-      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    "env_prefixes": {
+      "PATH": [
+        "RECIPE_PACKAGE_REPO[depot_tools]"
+      ]
    },
    "infra_step": true,
    "name": "bot_update",
@@ -82,10 +82,10 @@
      "--revision",
      "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9"
    ],
-    "env": {
-      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
-      "GIT_HTTP_LOW_SPEED_TIME": "300",
-      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    "env_prefixes": {
+      "PATH": [
+        "RECIPE_PACKAGE_REPO[depot_tools]"
+      ]
    },
    "infra_step": true,
    "name": "bot_update (without patch)",

--- a/recipes/recipe_modules/bot_update/examples/full.expected/gerrit_no_rebase_patch_ref.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/gerrit_no_rebase_patch_ref.json
@@ -21,10 +21,10 @@
      "--gerrit_no_rebase_patch_ref",
      "--disable-syntax-validation"
    ],
-    "env": {
-      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
-      "GIT_HTTP_LOW_SPEED_TIME": "300",
-      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    "env_prefixes": {
+      "PATH": [
+        "RECIPE_PACKAGE_REPO[depot_tools]"
+      ]
    },
    "infra_step": true,
    "name": "bot_update",
@@ -79,10 +79,10 @@
      "--revision",
      "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9"
    ],
-    "env": {
-      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
-      "GIT_HTTP_LOW_SPEED_TIME": "300",
-      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    "env_prefixes": {
+      "PATH": [
+        "RECIPE_PACKAGE_REPO[depot_tools]"
+      ]
    },
    "infra_step": true,
    "name": "bot_update (without patch)",

--- a/recipes/recipe_modules/bot_update/examples/full.expected/gerrit_no_reset.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/gerrit_no_reset.json
@@ -21,10 +21,10 @@
      "--gerrit_no_reset",
      "--disable-syntax-validation"
    ],
-    "env": {
-      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
-      "GIT_HTTP_LOW_SPEED_TIME": "300",
-      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    "env_prefixes": {
+      "PATH": [
+        "RECIPE_PACKAGE_REPO[depot_tools]"
+      ]
    },
    "infra_step": true,
    "name": "bot_update",
@@ -79,10 +79,10 @@
      "--revision",
      "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9"
    ],
-    "env": {
-      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
-      "GIT_HTTP_LOW_SPEED_TIME": "300",
-      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    "env_prefixes": {
+      "PATH": [
+        "RECIPE_PACKAGE_REPO[depot_tools]"
+      ]
    },
    "infra_step": true,
    "name": "bot_update (without patch)",

--- a/recipes/recipe_modules/bot_update/examples/full.expected/no_shallow.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/no_shallow.json
@@ -21,10 +21,10 @@
      "--no_shallow",
      "--disable-syntax-validation"
    ],
-    "env": {
-      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
-      "GIT_HTTP_LOW_SPEED_TIME": "300",
-      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    "env_prefixes": {
+      "PATH": [
+        "RECIPE_PACKAGE_REPO[depot_tools]"
+      ]
    },
    "infra_step": true,
    "name": "bot_update",
@@ -79,10 +79,10 @@
      "--revision",
      "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9"
    ],
-    "env": {
-      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
-      "GIT_HTTP_LOW_SPEED_TIME": "300",
-      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    "env_prefixes": {
+      "PATH": [
+        "RECIPE_PACKAGE_REPO[depot_tools]"
+      ]
    },
    "infra_step": true,
    "name": "bot_update (without patch)",

--- a/recipes/recipe_modules/bot_update/examples/full.expected/reset_root_solution_revision.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/reset_root_solution_revision.json
@@ -20,10 +20,10 @@
      "src@revision",
      "--disable-syntax-validation"
    ],
-    "env": {
-      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
-      "GIT_HTTP_LOW_SPEED_TIME": "300",
-      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    "env_prefixes": {
+      "PATH": [
+        "RECIPE_PACKAGE_REPO[depot_tools]"
+      ]
    },
    "infra_step": true,
    "name": "bot_update",
@@ -78,10 +78,10 @@
      "--revision",
      "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9"
    ],
-    "env": {
-      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
-      "GIT_HTTP_LOW_SPEED_TIME": "300",
-      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    "env_prefixes": {
+      "PATH": [
+        "RECIPE_PACKAGE_REPO[depot_tools]"
+      ]
    },
    "infra_step": true,
    "name": "bot_update (without patch)",

--- a/recipes/recipe_modules/bot_update/examples/full.expected/trychange.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/trychange.json
@@ -22,10 +22,10 @@
      "+refs/change/1/2/333",
      "--disable-syntax-validation"
    ],
-    "env": {
-      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
-      "GIT_HTTP_LOW_SPEED_TIME": "300",
-      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    "env_prefixes": {
+      "PATH": [
+        "RECIPE_PACKAGE_REPO[depot_tools]"
+      ]
    },
    "infra_step": true,
    "name": "bot_update",
@@ -80,10 +80,10 @@
      "--revision",
      "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9"
    ],
-    "env": {
-      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
-      "GIT_HTTP_LOW_SPEED_TIME": "300",
-      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    "env_prefixes": {
+      "PATH": [
+        "RECIPE_PACKAGE_REPO[depot_tools]"
+      ]
    },
    "infra_step": true,
    "name": "bot_update (without patch)",

--- a/recipes/recipe_modules/bot_update/examples/full.expected/trychange_oauth2_buildbot.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/trychange_oauth2_buildbot.json
@@ -24,10 +24,10 @@
      "src@HEAD",
      "--disable-syntax-validation"
    ],
-    "env": {
-      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
-      "GIT_HTTP_LOW_SPEED_TIME": "300",
-      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    "env_prefixes": {
+      "PATH": [
+        "RECIPE_PACKAGE_REPO[depot_tools]"
+      ]
    },
    "infra_step": true,
    "name": "bot_update",
@@ -82,10 +82,10 @@
      "--revision",
      "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9"
    ],
-    "env": {
-      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
-      "GIT_HTTP_LOW_SPEED_TIME": "300",
-      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    "env_prefixes": {
+      "PATH": [
+        "RECIPE_PACKAGE_REPO[depot_tools]"
+      ]
    },
    "infra_step": true,
    "name": "bot_update (without patch)",

--- a/recipes/recipe_modules/bot_update/examples/full.expected/trychange_oauth2_json.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/trychange_oauth2_json.json
@@ -22,10 +22,10 @@
      "src@HEAD",
      "--disable-syntax-validation"
    ],
-    "env": {
-      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
-      "GIT_HTTP_LOW_SPEED_TIME": "300",
-      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    "env_prefixes": {
+      "PATH": [
+        "RECIPE_PACKAGE_REPO[depot_tools]"
+      ]
    },
    "infra_step": true,
    "name": "bot_update",
@@ -80,10 +80,10 @@
      "--revision",
      "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9"
    ],
-    "env": {
-      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
-      "GIT_HTTP_LOW_SPEED_TIME": "300",
-      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    "env_prefixes": {
+      "PATH": [
+        "RECIPE_PACKAGE_REPO[depot_tools]"
+      ]
    },
    "infra_step": true,
    "name": "bot_update (without patch)",

--- a/recipes/recipe_modules/bot_update/examples/full.expected/trychange_oauth2_json_win.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/trychange_oauth2_json_win.json
@@ -22,10 +22,10 @@
      "src@HEAD",
      "--disable-syntax-validation"
    ],
-    "env": {
-      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
-      "GIT_HTTP_LOW_SPEED_TIME": "300",
-      "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]"
+    "env_prefixes": {
+      "PATH": [
+        "RECIPE_PACKAGE_REPO[depot_tools]"
+      ]
    },
    "infra_step": true,
    "name": "bot_update",
@@ -80,10 +80,10 @@
      "--revision",
      "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9"
    ],
-    "env": {
-      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
-      "GIT_HTTP_LOW_SPEED_TIME": "300",
-      "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]"
+    "env_prefixes": {
+      "PATH": [
+        "RECIPE_PACKAGE_REPO[depot_tools]"
+      ]
    },
    "infra_step": true,
    "name": "bot_update (without patch)",

--- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob.json
@@ -26,10 +26,10 @@
      "src@HEAD",
      "--disable-syntax-validation"
    ],
-    "env": {
-      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
-      "GIT_HTTP_LOW_SPEED_TIME": "300",
-      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    "env_prefixes": {
+      "PATH": [
+        "RECIPE_PACKAGE_REPO[depot_tools]"
+      ]
    },
    "infra_step": true,
    "name": "bot_update",
@@ -86,10 +86,10 @@
      "--revision",
      "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9"
    ],
-    "env": {
-      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
-      "GIT_HTTP_LOW_SPEED_TIME": "300",
-      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    "env_prefixes": {
+      "PATH": [
+        "RECIPE_PACKAGE_REPO[depot_tools]"
+      ]
    },
    "infra_step": true,
    "name": "bot_update (without patch)",

--- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json
@@ -26,10 +26,10 @@
      "src@HEAD",
      "--disable-syntax-validation"
    ],
-    "env": {
-      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
-      "GIT_HTTP_LOW_SPEED_TIME": "300",
-      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    "env_prefixes": {
+      "PATH": [
+        "RECIPE_PACKAGE_REPO[depot_tools]"
+      ]
    },
    "infra_step": true,
    "name": "bot_update",

--- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch.json
@@ -26,10 +26,10 @@
      "src@HEAD",
      "--disable-syntax-validation"
    ],
-    "env": {
-      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
-      "GIT_HTTP_LOW_SPEED_TIME": "300",
-      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    "env_prefixes": {
+      "PATH": [
+        "RECIPE_PACKAGE_REPO[depot_tools]"
+      ]
    },
    "infra_step": true,
    "name": "bot_update",

--- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch_download.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch_download.json
@@ -26,10 +26,10 @@
      "src@HEAD",
      "--disable-syntax-validation"
    ],
-    "env": {
-      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
-      "GIT_HTTP_LOW_SPEED_TIME": "300",
-      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    "env_prefixes": {
+      "PATH": [
+        "RECIPE_PACKAGE_REPO[depot_tools]"
+      ]
    },
    "infra_step": true,
    "name": "bot_update",

--- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_angle.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_angle.json
@@ -26,10 +26,10 @@
      "src/third_party/angle@HEAD",
      "--disable-syntax-validation"
    ],
-    "env": {
-      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
-      "GIT_HTTP_LOW_SPEED_TIME": "300",
-      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    "env_prefixes": {
+      "PATH": [
+        "RECIPE_PACKAGE_REPO[depot_tools]"
+      ]
    },
    "infra_step": true,
    "name": "bot_update",
@@ -87,10 +87,10 @@
      "--revision",
      "src/third_party/angle@HEAD"
    ],
-    "env": {
-      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
-      "GIT_HTTP_LOW_SPEED_TIME": "300",
-      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    "env_prefixes": {
+      "PATH": [
+        "RECIPE_PACKAGE_REPO[depot_tools]"
+      ]
    },
    "infra_step": true,
    "name": "bot_update (without patch)",

--- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_angle_deprecated.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_angle_deprecated.json
@@ -26,10 +26,10 @@
      "src/third_party/angle@HEAD",
      "--disable-syntax-validation"
    ],
-    "env": {
-      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
-      "GIT_HTTP_LOW_SPEED_TIME": "300",
-      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    "env_prefixes": {
+      "PATH": [
+        "RECIPE_PACKAGE_REPO[depot_tools]"
+      ]
    },
    "infra_step": true,
    "name": "bot_update",
@@ -87,10 +87,10 @@
      "--revision",
      "src/third_party/angle@HEAD"
    ],
-    "env": {
-      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
-      "GIT_HTTP_LOW_SPEED_TIME": "300",
-      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    "env_prefixes": {
+      "PATH": [
+        "RECIPE_PACKAGE_REPO[depot_tools]"
+      ]
    },
    "infra_step": true,
    "name": "bot_update (without patch)",

--- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8.json
@@ -28,10 +28,10 @@
      "src/v8@abc",
      "--disable-syntax-validation"
    ],
-    "env": {
-      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
-      "GIT_HTTP_LOW_SPEED_TIME": "300",
-      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    "env_prefixes": {
+      "PATH": [
+        "RECIPE_PACKAGE_REPO[depot_tools]"
+      ]
    },
    "infra_step": true,
    "name": "bot_update",
@@ -91,10 +91,10 @@
      "--revision",
      "src/v8@abc"
    ],
-    "env": {
-      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
-      "GIT_HTTP_LOW_SPEED_TIME": "300",
-      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    "env_prefixes": {
+      "PATH": [
+        "RECIPE_PACKAGE_REPO[depot_tools]"
+      ]
    },
    "infra_step": true,
    "name": "bot_update (without patch)",

--- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8_head_by_default.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8_head_by_default.json
@@ -28,10 +28,10 @@
      "src/v8@HEAD",
      "--disable-syntax-validation"
    ],
-    "env": {
-      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
-      "GIT_HTTP_LOW_SPEED_TIME": "300",
-      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    "env_prefixes": {
+      "PATH": [
+        "RECIPE_PACKAGE_REPO[depot_tools]"
+      ]
    },
    "infra_step": true,
    "name": "bot_update",
@@ -91,10 +91,10 @@
      "--revision",
      "src/v8@HEAD"
    ],
-    "env": {
-      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
-      "GIT_HTTP_LOW_SPEED_TIME": "300",
-      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    "env_prefixes": {
+      "PATH": [
+        "RECIPE_PACKAGE_REPO[depot_tools]"
+      ]
    },
    "infra_step": true,
    "name": "bot_update (without patch)",

--- a/recipes/recipe_modules/bot_update/examples/full.expected/with_tags.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/with_tags.json
@@ -21,10 +21,10 @@
      "--with_tags",
      "--disable-syntax-validation"
    ],
-    "env": {
-      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
-      "GIT_HTTP_LOW_SPEED_TIME": "300",
-      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    "env_prefixes": {
+      "PATH": [
+        "RECIPE_PACKAGE_REPO[depot_tools]"
+      ]
    },
    "infra_step": true,
    "name": "bot_update",
@@ -79,10 +79,10 @@
      "--revision",
      "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9"
    ],
-    "env": {
-      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
-      "GIT_HTTP_LOW_SPEED_TIME": "300",
-      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    "env_prefixes": {
+      "PATH": [
+        "RECIPE_PACKAGE_REPO[depot_tools]"
+      ]
    },
    "infra_step": true,
    "name": "bot_update (without patch)",

--- a/recipes/recipe_modules/depot_tools/api.py
+++ b/recipes/recipe_modules/depot_tools/api.py
@@ -13,6 +13,11 @@ class DepotToolsApi(recipe_api.RecipeApi):
  def upload_to_google_storage_path(self):
    return self.package_repo_resource('upload_to_google_storage.py')

+  @property
+  def root(self):
+    """Returns (Path): The "depot_tools" root directory."""
+    return self.package_repo_resource()
+
  @property
  def cros_path(self):
    return self.package_repo_resource('cros')

--- a/recipes/recipe_modules/depot_tools/examples/full.expected/basic.json
+++ b/recipes/recipe_modules/depot_tools/examples/full.expected/basic.json
 [
+  {
+    "cmd": [
+      "ls",
+      "RECIPE_PACKAGE_REPO[depot_tools]"
+    ],
+    "name": "root"
+  },
  {
    "cmd": [
      "ls",

--- a/recipes/recipe_modules/depot_tools/examples/full.expected/win.json
+++ b/recipes/recipe_modules/depot_tools/examples/full.expected/win.json
 [
+  {
+    "cmd": [
+      "ls",
+      "RECIPE_PACKAGE_REPO[depot_tools]"
+    ],
+    "name": "root"
+  },
  {
    "cmd": [
      "ls",

--- a/recipes/recipe_modules/depot_tools/examples/full.py
+++ b/recipes/recipe_modules/depot_tools/examples/full.py
@@ -11,6 +11,8 @@ DEPS = [


 def RunSteps(api):
+  api.step('root', ['ls', api.depot_tools.root])
+
  api.step(
      'download_from_google_storage',
      ['ls', api.depot_tools.download_from_google_storage_path])