Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1033)

Unified Diff: infra/bots/recipe_modules/skia_swarming/api.py

Issue 2202053005: More fixes for SwarmBucket (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Address comment Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: infra/bots/recipe_modules/skia_swarming/api.py
diff --git a/infra/bots/recipe_modules/skia_swarming/api.py b/infra/bots/recipe_modules/skia_swarming/api.py
index 6993b9de41590b65e45482c98574907afecc14af..f1b0143aa3d6147cf56b485349b7480938d578eb 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)

Powered by Google App Engine
This is Rietveld 408576698