From ef4848fd7cebba99247279673049e0a161d7a877 Mon Sep 17 00:00:00 2001 From: Eric Boren Date: Wed, 23 Nov 2016 12:46:26 -0500 Subject: [PATCH] Fix is_trybot for no-buildbot bots This was breaking gold/perf trybot results for no-buildbot bots. Note that: - Upload destination was correct, due to upload_nano_results using the correct property names. - Patches were properly applied, since bot_update uses the properties independently of our logic. BUG=skia: Change-Id: I16f2e2d24d4602dc73233784d098f00b745e061a Reviewed-on: https://skia-review.googlesource.com/5201 Reviewed-by: Ravi Mistry Commit-Queue: Eric Boren --- infra/bots/recipe_modules/vars/api.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/infra/bots/recipe_modules/vars/api.py b/infra/bots/recipe_modules/vars/api.py index 3a894c6..7a73efd 100644 --- a/infra/bots/recipe_modules/vars/api.py +++ b/infra/bots/recipe_modules/vars/api.py @@ -121,16 +121,16 @@ class SkiaVarsApi(recipe_api.RecipeApi): self.issue = self.m.properties['issue'] self.patchset = self.m.properties['patchset'] elif (self.m.properties.get('patch_issue', '') and - self.m.properties.get('patch_ref', '')): + self.m.properties.get('patch_set', '')): self.is_trybot = True self.issue = self.m.properties['patch_issue'] - self.patchset = self.m.properties['patch_ref'].split('/')[-1] + self.patchset = self.m.properties['patch_set'] else: self.is_trybot = self.builder_cfg['is_trybot'] if self.is_trybot: if self.patch_storage == 'gerrit': self.issue = self.m.properties['patch_issue'] - self.patchset = self.m.properties['patch_ref'].split('/')[-1] + self.patchset = self.m.properties['patch_set'] else: self.issue = self.m.properties['issue'] self.patchset = self.m.properties['patchset'] -- 2.7.4