Recipe fixes to support try jobs in task scheduler

infra/bots/recipes/upload_dm_results.py

 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
 # Recipe for uploading DM results.
 
 
 DEPS = [
   'build/file',
@@ skipping 31 matching lines @@
       break
     except api.step.StepFailure:
       if i == UPLOAD_ATTEMPTS - 1:
         raise
 
 
 def RunSteps(api):
   builder_name = api.properties['buildername']
   revision = api.properties['revision']
 
-  patch_storage = api.properties.get('patch_storage', 'rietveld')
-  issue = None
-  patchset = None
-  if builder_name.endswith('-Trybot'):
-    if patch_storage == 'gerrit':
-      issue = str(api.properties['event.change.number'])
-      patchset = str(api.properties['event.patchSet.ref'].split('/')[-1])
-    else:
-      issue = str(api.properties['issue'])
-      patchset = str(api.properties['patchset'])
-
   results_dir = api.path['cwd'].join('dm')
 
   # Move dm.json and verbose.log to their own directory.
   json_file = results_dir.join(DM_JSON)
   log_file = results_dir.join(VERBOSE_LOG)
   tmp_dir = api.path['cwd'].join('tmp_upload')
   api.shutil.makedirs('tmp dir', tmp_dir, infra_step=True)
   api.shutil.copy('copy dm.json', json_file, tmp_dir)
   api.shutil.copy('copy verbose.log', log_file, tmp_dir)
   api.shutil.remove('rm old dm.json', json_file)
@@ skipping 15 matching lines @@
       'dm-json-v1',
       str(now.year ).zfill(4),
       str(now.month).zfill(2),
       str(now.day  ).zfill(2),
       str(now.hour ).zfill(2),
       revision,
       builder_name,
       str(int(calendar.timegm(now.utctimetuple())))])
 
   # Trybot results are further siloed by issue/patchset.
-  if builder_name.endswith('-Trybot'):
-    if not (issue and patchset):  # pragma: nocover
-      raise Exception('issue and patchset properties are required for trybots.')
-    summary_dest_path = '/'.join(('trybot', summary_dest_path, 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'):
+    issue = str(api.properties['event.change.number'])
+    patchset = str(api.properties['event.patchSet.ref']).split('/')[-1]
+  if issue and patchset:
+    summary_dest_path = '/'.join((
+        'trybot', summary_dest_path, issue, patchset))
 
   summary_dest_path = '/'.join((GS_BUCKET, summary_dest_path))
 
   cp(api, 'JSON and logs', tmp_dir.join('*'), summary_dest_path,
      ['-z', 'json,log'])
 
 
 def GenTests(api):
   builder = 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug'
   yield (
@@ skipping 40 matching lines @@
     'event.change.number': '2100',
   }
   yield (
       api.test('recipe_with_gerrit_patch') +
       api.properties(
           buildername=builder,
           revision='abc123',
           path_config='kitchen',
           **gerrit_kwargs)
   )