commit 283eb302330e9b9a2f144f341ec12cac54590ebf
author Eric Boren <borenet@google.com> Mon Nov 07 17:16:05 2016 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Nov 08 13:25:46 2016 +0000
tree a24db4ee5f3b3cef172cf1d60ded3232a4e65e7a
parent e48b4c550de60f3c2316f31125ee305c8df280ba

Fix trybot results upload for new-style bots

BUG=skia:

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4532

Change-Id: I83a4c52e18d087e3f662399387bc3aaf76fd5cba
Reviewed-on: https://skia-review.googlesource.com/4532
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Eric Boren <borenet@google.com>

infra/bots/recipes/upload_dm_results.py

diff --git a/infra/bots/recipes/upload_dm_results.py b/infra/bots/recipes/upload_dm_results.py
index dffcc92..8e62e24 100644
--- a/infra/bots/recipes/upload_dm_results.py
+++ b/infra/bots/recipes/upload_dm_results.py
@@ -86,10 +86,9 @@
   # Trybot results are further siloed by issue/patchset.
   issue = str(api.properties.get('issue', ''))
   patchset = str(api.properties.get('patchset', ''))
-  if (api.properties.get('patch_storage', '') == 'gerrit' and
-      api.properties.get('nobuildbot', '') != 'True'):
+  if api.properties.get('patch_storage', '') == 'gerrit':
     issue = str(api.properties['patch_issue'])
-    patchset = str(api.properties['patch_ref']).split('/')[-1]
+    patchset = str(api.properties['patch_set'])
   if issue and patchset:
     summary_dest_path = '/'.join((
         'trybot', summary_dest_path, issue, patchset))

infra/bots/recipes/upload_nano_results.py

diff --git a/infra/bots/recipes/upload_nano_results.py b/infra/bots/recipes/upload_nano_results.py
index cf71fdc..ce3aa1a 100644
--- a/infra/bots/recipes/upload_nano_results.py
+++ b/infra/bots/recipes/upload_nano_results.py
@@ -41,10 +41,9 @@
 
   issue = str(api.properties.get('issue', ''))
   patchset = str(api.properties.get('patchset', ''))
-  if (api.properties.get('patch_storage', '') == 'gerrit' and
-      api.properties.get('nobuildbot', '') != 'True'):
+  if api.properties.get('patch_storage', '') == 'gerrit':
     issue = str(api.properties['patch_issue'])
-    patchset = str(api.properties['patch_ref']).split('/')[-1]
+    patchset = str(api.properties['patch_set'])
   if issue and patchset:
     gs_path = '/'.join(('trybot', gs_path, issue, patchset))