From 283eb302330e9b9a2f144f341ec12cac54590ebf Mon Sep 17 00:00:00 2001 From: Eric Boren Date: Mon, 7 Nov 2016 17:16:05 -0500 Subject: 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 Commit-Queue: Eric Boren --- infra/bots/recipes/upload_dm_results.py | 5 ++--- infra/bots/recipes/upload_nano_results.py | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'infra/bots') 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)) -- cgit v1.2.3