More fixes for SwarmBucket

infra/bots/recipe_modules/skia_swarming/api.py

 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
 from recipe_engine import recipe_api
 import shlex
 
 
 DEFAULT_TASK_EXPIRATION = 20*60*60
@@ skipping 23 matching lines @@
   def setup(self, luci_go_dir, swarming_rev=None):
     """Performs setup steps for swarming."""
     self.m.swarming_client.checkout(revision=swarming_rev)
     self.m.swarming.check_client_version(step_test_data=(0, 8, 6))
     self.setup_go_isolate(luci_go_dir)
     self.m.swarming.add_default_tag('allow_milo:1')
 
   # 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)
     self.m.file.copytree('Copy Go binary',
                          source=luci_go_dir,
                          dest=dest)
 
   def isolate_and_trigger_task(
       self, isolate_path, isolate_base_dir, task_name, isolate_vars,
       swarm_dimensions, isolate_blacklist=None, extra_isolate_hashes=None,
@@ skipping 213 matching lines @@
     else:
       for _, task in step_result.json.output.get('tasks', {}).iteritems():
         ids.append(task['task_id'])
     for idx, task_id in enumerate(ids):
       link = MILO_LOG_LINK % task_id
       k = 'view steps on Milo'
       if len(ids) > 1:  # pragma: nocover
         k += ' (shard index %d, %d total)' % (idx, len(ids))
       step_result.presentation.links[k] = link