diff options
| author |  Eric Boren <borenet@google.com> | 2018-04-16 13:21:01 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-04-16 13:21:07 +0000 |
| commit | 276886160ba96748c901b7319ca8f876415269c6 (patch) | |
| tree | 7fea348d2dcb256b8717da253865ea76aa5bd319 /infra/bots/recipe_modules/vars/api.py | |
| parent | 7bbb26fee0dcd7c53c1f5b80f62966654dd823ba (diff) | |
Revert "[infra] Run recipes through Kitchen"
This reverts commit 7bbb26fee0dcd7c53c1f5b80f62966654dd823ba.
Reason for revert: uploads broke task scheduler
Original change's description:
> [infra] Run recipes through Kitchen
>
> Bug: skia:7050
> Change-Id: I50632444eb4ca7f9ae2b1b30b766e531092ccad4
> Reviewed-on: https://skia-review.googlesource.com/82500
> Commit-Queue: Eric Boren <borenet@google.com>
> Reviewed-by: Ravi Mistry <rmistry@google.com>
TBR=borenet@google.com,rmistry@google.com
Change-Id: Ic3a5404fde844f01eca551d50039a84a20e84e11
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:7050
Reviewed-on: https://skia-review.googlesource.com/121423
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
Diffstat (limited to 'infra/bots/recipe_modules/vars/api.py')
| -rw-r--r-- | infra/bots/recipe_modules/vars/api.py | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/infra/bots/recipe_modules/vars/api.py b/infra/bots/recipe_modules/vars/api.py index 26bde8c9d8..9158233213 100644 --- a/infra/bots/recipe_modules/vars/api.py +++ b/infra/bots/recipe_modules/vars/api.py @@ -27,12 +27,6 @@ class SkiaVarsApi(recipe_api.RecipeApi): self.builder_name = self.m.properties['buildername'] self.slave_dir = self.m.path['start_dir'] - - # Special input/output directories. - self.build_dir = self.slave_dir.join('build') - self.test_dir = self.slave_dir.join('test') - self.perf_dir = self.slave_dir.join('perf') - self.checkout_root = self.slave_dir self.default_env = self.m.context.env self.default_env['CHROME_HEADLESS'] = '1' @@ -40,7 +34,7 @@ class SkiaVarsApi(recipe_api.RecipeApi): self.default_env.get('PATH', '%(PATH)s'), str(self.m.bot_update._module.PACKAGE_REPO_ROOT), ]) - self.gclient_env = {'DEPOT_TOOLS_UPDATE': '0'} + self.gclient_env = {} self.is_compile_bot = self.builder_name.startswith('Build-') self.persistent_checkout = False @@ -70,7 +64,7 @@ class SkiaVarsApi(recipe_api.RecipeApi): # got_revision is filled in after checkout steps. self.got_revision = None else: - # If there's no persistent checkout, then we have to assume we got the + # If there's no persistent checkout, then we have to asume we got the # correct revision of the files from isolate. self.got_revision = self.m.properties['revision'] @@ -96,8 +90,7 @@ class SkiaVarsApi(recipe_api.RecipeApi): self.resource_dir = self.skia_dir.join('resources') self.images_dir = self.slave_dir.join('skimage') self.skia_out = self.skia_dir.join('out', self.builder_name) - self.swarming_out_dir = self.slave_dir.join( - self.m.properties['swarm_out_dir']) + self.swarming_out_dir = self.make_path(self.m.properties['swarm_out_dir']) if 'ParentRevision' in self.builder_name: # Tasks that depend on ParentRevision builds usually also depend on a # second build task. Use a different path for build results so that the @@ -106,7 +99,7 @@ class SkiaVarsApi(recipe_api.RecipeApi): self.local_skp_dir = self.slave_dir.join('skp') self.local_svg_dir = self.slave_dir.join('svg') if not self.is_compile_bot: - self.skia_out = self.build_dir.join('out') + self.skia_out = self.slave_dir.join('out') self.tmp_dir = self.m.path['start_dir'].join('tmp') # Some bots also require a checkout of chromium. |