AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Recipes: Remove depot_tools path hack

Browse Source 
Bug: skia:6473
Change-Id: I722059844bb0bc9d58347b4f6002ee62043b9e20
Reviewed-on: https://skia-review.googlesource.com/13006
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
This commit is contained in:
Eric Boren 2017-04-10 11:23:04 -04:00 committed by Skia Commit-Bot
parent b8ab7f7634
commit 68a58ea755
8 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
infra/bots/recipe_modules/vars/api.py
View File

@ -29,6 +29,7 @@ class SkiaVarsApi(recipe_api.RecipeApi):
self.slave_dir = self.m.path['start_dir']
self.checkout_root = self.slave_dir
self.default_env = self.m.step.get_from_context('env', {})
self.default_env['CHROME_HEADLESS'] = '1'
self.default_env['PATH'] = self.m.path.pathsep.join([
self.default_env.get('PATH', '%(PATH)s'),
str(self.m.bot_update._module.PACKAGE_REPO_ROOT),
@ -36,16 +37,6 @@ class SkiaVarsApi(recipe_api.RecipeApi):
self.gclient_env = {}
self.is_compile_bot = self.builder_name.startswith('Build-')
self.default_env['CHROME_HEADLESS'] = '1'
# The 'depot_tools' directory comes from recipe DEPS and isn't provided by
# default. We have to set it manually.
self.m.path.c.base_paths['depot_tools'] = (
self.m.path.c.base_paths['start_dir'] +
('skia', 'infra', 'bots', '.recipe_deps', 'depot_tools'))
if 'Win' in self.builder_name:
self.m.path.c.base_paths['depot_tools'] = (
'c:\\', 'Users', 'chrome-bot', 'depot_tools')
# Compile bots keep a persistent checkout.
self.persistent_checkout = (self.is_compile_bot or
'RecreateSKPs' in self.builder_name or

2
infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json
View File

@ -112,7 +112,7 @@
"--githash",
"abc123",
"--gsutil_path",
"[DEPOT_TOOLS]/gsutil.py",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"--issue_number",
"456789"
],

2
infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit.json
View File

@ -122,7 +122,7 @@
"--githash",
"abc123",
"--gsutil_path",
"[DEPOT_TOOLS]/gsutil.py"
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py"
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {

3
infra/bots/recipes/housekeeper.py
View File

@ -6,6 +6,7 @@
# Recipe for the Skia PerCommit Housekeeper.
DEPS = [
'depot_tools/bot_update',
'recipe_engine/path',
'recipe_engine/properties',
'recipe_engine/python',
@ -35,7 +36,7 @@ def RunSteps(api):
# TODO(borenet): Detect static initializers?
with api.step.context({'cwd': cwd}):
gsutil_path = api.path['depot_tools'].join('gsutil.py')
gsutil_path = api.bot_update._module.PACKAGE_REPO_ROOT.join('gsutil.py')
if not api.vars.is_trybot:
api.run(
api.step,

2
infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json
View File

@ -186,7 +186,7 @@
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"CHROME_HEADLESS": "1",
"PATH": "[DEPOT_TOOLS]:%(PATH)s"
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
"name": "Recreate SKPs"
},

4
infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json
View File

@ -187,7 +187,7 @@
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"CHROME_HEADLESS": "1",
"PATH": "[DEPOT_TOOLS]:%(PATH)s"
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
"name": "Recreate SKPs"
},
@ -247,7 +247,7 @@
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[CUSTOM_/_B_WORK]/gopath",
"PATH": "[DEPOT_TOOLS]:%(PATH)s"
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
"name": "Upload SKPs"
},

4
infra/bots/recipes/recreate_skps.expected/failed_upload.json
View File

@ -187,7 +187,7 @@
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"CHROME_HEADLESS": "1",
"PATH": "[DEPOT_TOOLS]:%(PATH)s"
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
"name": "Recreate SKPs"
},
@ -247,7 +247,7 @@
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[CUSTOM_/_B_WORK]/gopath",
"PATH": "[DEPOT_TOOLS]:%(PATH)s"
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
"name": "Upload SKPs",
"~followup_annotations": [

3
infra/bots/recipes/recreate_skps.py
View File

@ -107,7 +107,8 @@ def RunSteps(api):
api.file.makedirs('skp_output', output_dir)
# Capture the SKPs.
path_var= api.path.pathsep.join([str(api.path['depot_tools']), '%(PATH)s'])
path_var= api.path.pathsep.join([
str(api.gclient._module.PACKAGE_REPO_ROOT), '%(PATH)s'])
env = {
'CHROME_HEADLESS': '1',
'PATH': path_var,