diff options
| author |  Eric Boren <borenet@google.com> | 2017-04-10 11:23:04 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-10 16:01:46 +0000 |
| commit | 68a58ea755e172421f99c25b8130a23cdfd36145 (patch) | |
| tree | 71413e2dda2e64aaf2580064625f2b042d06905d /infra/bots/recipe_modules | |
| parent | b8ab7f7634fc986962fdcdb70c7037a9d5b2ca9c (diff) | |
Recipes: Remove depot_tools path hack
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>
Diffstat (limited to 'infra/bots/recipe_modules')
| -rw-r--r-- | infra/bots/recipe_modules/vars/api.py | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/infra/bots/recipe_modules/vars/api.py b/infra/bots/recipe_modules/vars/api.py index a40271e788..ad2f3e95e6 100644 --- a/infra/bots/recipe_modules/vars/api.py +++ b/infra/bots/recipe_modules/vars/api.py @@ -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 |