diff options
| author |  Ravi Mistry <rmistry@google.com> | 2016-11-21 16:06:19 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-22 12:36:17 +0000 |
| commit | 9bcca6a2124b60ce9fab18ba697b28fc6a1354db (patch) | |
| tree | baca6579b9b011c6930b9324d55d7b8ed2e52255 /infra/bots/recipe_modules/vars | |
| parent | 759ae5639b0dfe5a0d5491aa0e0b9855aa42ab73 (diff) | |
Roll recipe DEPS
Looks like slave_build and cwd changed to start_dir in https://bugs.chromium.org/p/chromium/issues/detail?id=662586
BUG=skia:5979
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=5104
Change-Id: I46d080b9089ea9b4adc2ed45fc81fdc192bdb2b2
Reviewed-on: https://skia-review.googlesource.com/5104
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Ravi Mistry <rmistry@google.com>
Diffstat (limited to 'infra/bots/recipe_modules/vars')
| -rw-r--r-- | infra/bots/recipe_modules/vars/api.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/infra/bots/recipe_modules/vars/api.py b/infra/bots/recipe_modules/vars/api.py index a65db6b4be..3a894c6bfd 100644 --- a/infra/bots/recipe_modules/vars/api.py +++ b/infra/bots/recipe_modules/vars/api.py @@ -29,7 +29,7 @@ class SkiaVarsApi(recipe_api.RecipeApi): self.slave_name = self.m.properties['slavename'] self.build_number = self.m.properties['buildnumber'] - self.slave_dir = self.m.path['slave_build'] + self.slave_dir = self.m.path['start_dir'] self.checkout_root = self.slave_dir self.default_env = {} self.gclient_env = {} @@ -41,7 +41,7 @@ class SkiaVarsApi(recipe_api.RecipeApi): # 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['slave_build'] + + 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'] = ( @@ -81,7 +81,7 @@ class SkiaVarsApi(recipe_api.RecipeApi): self.local_svg_dir = self.slave_dir.join('svg') if not self.is_compile_bot: self.skia_out = self.slave_dir.join('out') - self.tmp_dir = self.m.path['slave_build'].join('tmp') + self.tmp_dir = self.m.path['start_dir'].join('tmp') # Some bots also require a checkout of chromium. self.need_chromium_checkout = False |