aboutsummaryrefslogtreecommitdiffhomepage
path: root/infra/bots
diff options
context:
space:
mode:
authorGravatar Eric Boren <borenet@google.com>2016-11-07 17:16:05 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2016-11-08 13:25:46 +0000
commit283eb302330e9b9a2f144f341ec12cac54590ebf (patch)
treea24db4ee5f3b3cef172cf1d60ded3232a4e65e7a /infra/bots
parente48b4c550de60f3c2316f31125ee305c8df280ba (diff)
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>
Diffstat (limited to 'infra/bots')
-rw-r--r--infra/bots/recipes/upload_dm_results.py5
-rw-r--r--infra/bots/recipes/upload_nano_results.py5
2 files changed, 4 insertions, 6 deletions
diff --git a/infra/bots/recipes/upload_dm_results.py b/infra/bots/recipes/upload_dm_results.py
index dffcc923d9..8e62e244a0 100644
--- a/infra/bots/recipes/upload_dm_results.py
+++ b/infra/bots/recipes/upload_dm_results.py
@@ -86,10 +86,9 @@ def RunSteps(api):
# 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))
diff --git a/infra/bots/recipes/upload_nano_results.py b/infra/bots/recipes/upload_nano_results.py
index cf71fdcd67..ce3aa1a313 100644
--- a/infra/bots/recipes/upload_nano_results.py
+++ b/infra/bots/recipes/upload_nano_results.py
@@ -41,10 +41,9 @@ def RunSteps(api):
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))