More fixes for SwarmBucket

BUG=skia:5581
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2202053005
NOTRY=true

Review-Url: https://codereview.chromium.org/2202053005

24 files changed, 208 insertions, 3 deletions

diff --git a/infra/bots/recipe_modules/skia_swarming/__init__.py b/infra/bots/recipe_modules/skia_swarming/__init__.py
index f87a628f20..1232fc2d99 100644
--- a/infra/bots/recipe_modules/skia_swarming/__init__.py
+++ b/infra/bots/recipe_modules/skia_swarming/__init__.py
@@ -7,6 +7,7 @@ DEPS = [
   'build/isolate',
   'build/swarming',
   'build/swarming_client',
+  'depot_tools/depot_tools',
   'recipe_engine/json',
   'recipe_engine/path',
   'recipe_engine/properties',
diff --git a/infra/bots/recipe_modules/skia_swarming/api.py b/infra/bots/recipe_modules/skia_swarming/api.py
index 6993b9de41..f1b0143aa3 100644
--- a/infra/bots/recipe_modules/skia_swarming/api.py
+++ b/infra/bots/recipe_modules/skia_swarming/api.py
@@ -41,18 +41,24 @@ class SkiaSwarmingApi(recipe_api.RecipeApi):
   # TODO(rmistry): Remove once the Go binaries are moved to recipes or buildbot.
   def setup_go_isolate(self, luci_go_dir):
     """Generates and puts in place the isolate Go binary."""
+    depot_tools_path = self.m.depot_tools.package_repo_resource()
+    env = {'PATH': self.m.path.pathsep.join([
+                       str(depot_tools_path), '%(PATH)s'])}
     self.m.step('download luci-go linux',
                 ['download_from_google_storage', '--no_resume',
                  '--platform=linux*', '--no_auth', '--bucket', 'chromium-luci',
-                 '-d', luci_go_dir.join('linux64')])
+                 '-d', luci_go_dir.join('linux64')],
+                env=env)
     self.m.step('download luci-go mac',
                 ['download_from_google_storage', '--no_resume',
                  '--platform=darwin', '--no_auth', '--bucket', 'chromium-luci',
-                 '-d', luci_go_dir.join('mac64')])
+                 '-d', luci_go_dir.join('mac64')],
+                env=env)
     self.m.step('download luci-go win',
                 ['download_from_google_storage', '--no_resume',
                  '--platform=win32', '--no_auth', '--bucket', 'chromium-luci',
-                 '-d', luci_go_dir.join('win64')])
+                 '-d', luci_go_dir.join('win64')],
+                env=env)
     # Copy binaries to the expected location.
     dest = self.m.path['slave_build'].join('luci-go')
     self.m.skia.rmtree(dest)
diff --git a/infra/bots/recipes/swarm_trigger.expected/Build-Mac-Clang-x86_64-Release.json b/infra/bots/recipes/swarm_trigger.expected/Build-Mac-Clang-x86_64-Release.json
index 5f85a216bc..5cbd6dc066 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Build-Mac-Clang-x86_64-Release.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Build-Mac-Clang-x86_64-Release.json
@@ -175,6 +175,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go linux"
   },
   {
@@ -188,6 +191,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go mac"
   },
   {
@@ -201,6 +207,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go win"
   },
   {
diff --git a/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-Arm64-Debug-Android_Vulkan.json b/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-Arm64-Debug-Android_Vulkan.json
index f73185c611..805687b5ef 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-Arm64-Debug-Android_Vulkan.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-Arm64-Debug-Android_Vulkan.json
@@ -175,6 +175,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go linux"
   },
   {
@@ -188,6 +191,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go mac"
   },
   {
@@ -201,6 +207,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go win"
   },
   {
diff --git a/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json b/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json
index fca5340699..2accb60ed4 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json
@@ -175,6 +175,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go linux"
   },
   {
@@ -188,6 +191,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go mac"
   },
   {
@@ -201,6 +207,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go win"
   },
   {
diff --git a/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Debug.json b/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Debug.json
index e247c778d0..0414ca0ad8 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Debug.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Debug.json
@@ -175,6 +175,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go linux"
   },
   {
@@ -188,6 +191,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go mac"
   },
   {
@@ -201,6 +207,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go win"
   },
   {
diff --git a/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Release-RemoteRun.json b/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Release-RemoteRun.json
index 7f38df13f6..a3e9d5ea6b 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Release-RemoteRun.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Release-RemoteRun.json
@@ -175,6 +175,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go linux"
   },
   {
@@ -188,6 +191,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go mac"
   },
   {
@@ -201,6 +207,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go win"
   },
   {
diff --git a/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Release-Trybot.json b/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Release-Trybot.json
index b3efa581a9..8c9a521679 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Release-Trybot.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Release-Trybot.json
@@ -175,6 +175,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go linux"
   },
   {
@@ -188,6 +191,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go mac"
   },
   {
@@ -201,6 +207,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go win"
   },
   {
diff --git a/infra/bots/recipes/swarm_trigger.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json b/infra/bots/recipes/swarm_trigger.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json
index d61a1e9968..72ae024645 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json
@@ -175,6 +175,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go linux"
   },
   {
@@ -188,6 +191,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go mac"
   },
   {
@@ -201,6 +207,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go win"
   },
   {
diff --git a/infra/bots/recipes/swarm_trigger.expected/Build-Win-MSVC-x86_64-Release.json b/infra/bots/recipes/swarm_trigger.expected/Build-Win-MSVC-x86_64-Release.json
index 7d3abd0e2c..1dd7ec0678 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Build-Win-MSVC-x86_64-Release.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Build-Win-MSVC-x86_64-Release.json
@@ -175,6 +175,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go linux"
   },
   {
@@ -188,6 +191,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go mac"
   },
   {
@@ -201,6 +207,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go win"
   },
   {
diff --git a/infra/bots/recipes/swarm_trigger.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json b/infra/bots/recipes/swarm_trigger.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json
index aed9481d93..491ffd5510 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json
@@ -175,6 +175,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go linux"
   },
   {
@@ -188,6 +191,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go mac"
   },
   {
@@ -201,6 +207,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go win"
   },
   {
diff --git a/infra/bots/recipes/swarm_trigger.expected/Housekeeper-PerCommit.json b/infra/bots/recipes/swarm_trigger.expected/Housekeeper-PerCommit.json
index 026aa5a40a..ce1ef4d441 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Housekeeper-PerCommit.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Housekeeper-PerCommit.json
@@ -175,6 +175,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go linux"
   },
   {
@@ -188,6 +191,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go mac"
   },
   {
@@ -201,6 +207,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go win"
   },
   {
diff --git a/infra/bots/recipes/swarm_trigger.expected/Infra-PerCommit.json b/infra/bots/recipes/swarm_trigger.expected/Infra-PerCommit.json
index a11d99c121..9d7ca5ee52 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Infra-PerCommit.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Infra-PerCommit.json
@@ -175,6 +175,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go linux"
   },
   {
@@ -188,6 +191,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go mac"
   },
   {
@@ -201,6 +207,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go win"
   },
   {
diff --git a/infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot.json b/infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot.json
index aad4accfd5..5d68baa509 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot.json
@@ -175,6 +175,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go linux"
   },
   {
@@ -188,6 +191,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go mac"
   },
   {
@@ -201,6 +207,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go win"
   },
   {
diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan.json b/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan.json
index 36c312dc46..9a8507fe14 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan.json
@@ -175,6 +175,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go linux"
   },
   {
@@ -188,6 +191,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go mac"
   },
   {
@@ -201,6 +207,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go win"
   },
   {
diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-Nexus7v2-GPU-Tegra3-Arm7-Release.json b/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-Nexus7v2-GPU-Tegra3-Arm7-Release.json
index 5ec3191b0a..953feb3a18 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-Nexus7v2-GPU-Tegra3-Arm7-Release.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-Nexus7v2-GPU-Tegra3-Arm7-Release.json
@@ -175,6 +175,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go linux"
   },
   {
@@ -188,6 +191,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go mac"
   },
   {
@@ -201,6 +207,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go win"
   },
   {
diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release.json b/infra/bots/recipes/swarm_trigger.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release.json
index 4e43bbd17c..409aadf20c 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release.json
@@ -175,6 +175,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go linux"
   },
   {
@@ -188,6 +191,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go mac"
   },
   {
@@ -201,6 +207,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go win"
   },
   {
diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json
index 6202166e45..c6d06e5edd 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json
@@ -175,6 +175,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go linux"
   },
   {
@@ -188,6 +191,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go mac"
   },
   {
@@ -201,6 +207,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go win"
   },
   {
diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json
index ea27bdeace..b6c6bffe82 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json
@@ -175,6 +175,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go linux"
   },
   {
@@ -188,6 +191,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go mac"
   },
   {
@@ -201,6 +207,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go win"
   },
   {
diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json
index 55c81b8440..97a49aa7c7 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json
@@ -175,6 +175,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go linux"
   },
   {
@@ -188,6 +191,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go mac"
   },
   {
@@ -201,6 +207,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go win"
   },
   {
diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json
index 3013e30b1a..e202a38b36 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json
@@ -175,6 +175,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go linux"
   },
   {
@@ -188,6 +191,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go mac"
   },
   {
@@ -201,6 +207,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go win"
   },
   {
diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Release.json b/infra/bots/recipes/swarm_trigger.expected/Test-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Release.json
index eeceac296f..97c64a6501 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Test-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Release.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Test-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Release.json
@@ -175,6 +175,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go linux"
   },
   {
@@ -188,6 +191,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go mac"
   },
   {
@@ -201,6 +207,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go win"
   },
   {
diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release.json b/infra/bots/recipes/swarm_trigger.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release.json
index 542022c23a..d3ad377f13 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release.json
@@ -175,6 +175,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go linux"
   },
   {
@@ -188,6 +191,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go mac"
   },
   {
@@ -201,6 +207,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go win"
   },
   {
diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release.json b/infra/bots/recipes/swarm_trigger.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release.json
index 8dc518ad07..bdaf37a74d 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release.json
@@ -175,6 +175,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go linux"
   },
   {
@@ -188,6 +191,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go mac"
   },
   {
@@ -201,6 +207,9 @@
       "-d",
       "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64"
     ],
+    "env": {
+      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+    },
     "name": "download luci-go win"
   },
   {