Apply gerrit ref if it is a Gerrit patch

infra/bots/recipes/swarm_trigger.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 module for Skia Swarming trigger.
 
 
 import os
 import json
@@ skipping 175 matching lines @@
   properties = {
     'buildername': builder,
     'mastername': master,
     'buildnumber': buildnumber,
     'reason': 'Triggered by Skia swarm_trigger Recipe',
     'revision': got_revision,
     'slavename': slave,
     'swarm_out_dir': '${ISOLATED_OUTDIR}',
   }
   if builder_cfg['is_trybot']:
-    properties['issue'] = str(api.properties['issue'])
-    properties['patchset'] = str(api.properties['patchset'])
-    properties['rietveld'] = api.properties['rietveld']
+    if api.properties.get('patch_storage') == 'gerrit':
+      properties['patch_storage'] = api.properties['patch_storage']
+      properties['repository'] = api.properties['repository']
+      properties['event.patchSet.ref'] = api.properties['event.patchSet.ref']
+      properties['event.change.number'] = api.properties['event.change.number']
+    else:
+      properties['issue'] = str(api.properties['issue'])
+      properties['patchset'] = str(api.properties['patchset'])
+      properties['rietveld'] = api.properties['rietveld']
 
   extra_args = [
       '--workdir', '../../..',
       'swarm_%s' % task_name,
   ]
   for k, v in properties.iteritems():
     extra_args.append('%s=%s' % (k, v))
 
   isolate_base_dir = api.path['slave_build']
   dimensions = swarm_dimensions(builder_cfg)
@@ skipping 202 matching lines @@
   if api.path._test_data.enabled:
     home_dir = '[HOME]'
 
   boto_path = None
   if boto_file:
     boto_path = api.path.join(home_dir, boto_file)
   return {'AWS_CREDENTIAL_FILE': boto_path,
           'BOTO_CONFIG': boto_path}
 
 
+def get_issue_num(api, builder_cfg):
+  if not builder_cfg['is_trybot']:
+    return ''
+  if api.properties.get('patch_storage') == 'gerrit':
+    # TODO(rmistry): Figure out what to do for Gerrit here.
+    return ''
+  else:
+    return str(api.properties['issue'])
+
+
 def perf_steps_trigger(api, builder_cfg, got_revision, infrabots_dir,
                        extra_hashes, cipd_packages):
   """Trigger perf tests via Swarming."""
 
   expiration, hard_timeout, io_timeout = get_timeouts(builder_cfg)
   return trigger_task(
       api,
       'perf',
       api.properties['buildername'],
       api.properties['mastername'],
       api.properties['slavename'],
       api.properties['buildnumber'],
       builder_cfg,
       got_revision,
       infrabots_dir,
       extra_isolate_hashes=extra_hashes,
       expiration=expiration,
       hard_timeout=hard_timeout,
       io_timeout=io_timeout,
       cipd_packages=cipd_packages)
 
 
-def perf_steps_collect(api, task, got_revision, is_trybot):
+def perf_steps_collect(api, task, got_revision, is_trybot, builder_cfg):
   """Wait for perf steps to finish and upload results."""
   # Wait for nanobench to finish, download the results.
   api.run.rmtree(task.task_output_dir)
   api.swarming.collect_swarming_task(task)
 
   # Upload the results.
   if api.vars.upload_perf_results:
     perf_data_dir = api.path['slave_build'].join(
         'perfdata', api.properties['buildername'], 'data')
     git_timestamp = api.git.get_timestamp(test_data='1408633190',
                                           infra_step=True)
     api.run.rmtree(perf_data_dir)
     api.file.makedirs('perf_dir', perf_data_dir, infra_step=True)
     src_results_file = task.task_output_dir.join(
         '0', 'perfdata', api.properties['buildername'], 'data',
         'nanobench_%s.json' % got_revision)
     dst_results_file = perf_data_dir.join(
         'nanobench_%s_%s.json' % (got_revision, git_timestamp))
     api.file.copy('perf_results', src_results_file, dst_results_file,
                   infra_step=True)
 
     gsutil_path = api.path['slave_build'].join(
         'skia', 'infra', 'bots', '.recipe_deps', 'depot_tools', 'third_party',
         'gsutil', 'gsutil')
     upload_args = [api.properties['buildername'], api.properties['buildnumber'],
                    perf_data_dir, got_revision, gsutil_path]
     if is_trybot:
-      upload_args.append(api.properties['issue'])
+      upload_args.append(get_issue_num(api, builder_cfg))
     api.python(
         'Upload perf results',
         script=api.core.resource('upload_bench_results.py'),
         args=upload_args,
         cwd=api.path['checkout'],
         infra_step=True)
 
 
 def test_steps_trigger(api, builder_cfg, got_revision, infrabots_dir,
                        extra_hashes, cipd_packages):
@@ skipping 31 matching lines @@
 
     # Upload them to Google Storage.
     api.python(
         'Upload DM Results',
         script=api.core.resource('upload_dm_results.py'),
         args=[
           dm_dir,
           got_revision,
           api.properties['buildername'],
           api.properties['buildnumber'],
-          api.properties['issue'] if is_trybot else '',
+          get_issue_num(api, builder_cfg),
           api.path['slave_build'].join('skia', 'common', 'py', 'utils'),
         ],
         cwd=api.path['checkout'],
         env=gsutil_env(api, 'chromium-skia-gm.boto'),
         infra_step=True)
 
   if builder_cfg['configuration']  == 'Coverage':
-    upload_coverage_results(api, task, got_revision, is_trybot)
+    upload_coverage_results(api, task, got_revision, is_trybot, builder_cfg)
 
 
-def upload_coverage_results(api, task, got_revision, is_trybot):
+def upload_coverage_results(api, task, got_revision, is_trybot, builder_cfg):
   results_dir = task.task_output_dir.join('0')
   git_timestamp = api.git.get_timestamp(test_data='1408633190',
                                         infra_step=True)
 
   # Upload raw coverage data.
   cov_file_basename = '%s.cov' % got_revision
   cov_file = results_dir.join(cov_file_basename)
   now = api.time.utcnow()
   gs_json_path = '/'.join((
       str(now.year).zfill(4), str(now.month).zfill(2),
       str(now.day).zfill(2), str(now.hour).zfill(2),
       api.properties['buildername'],
       str(api.properties['buildnumber'])))
   if is_trybot:
     gs_json_path = '/'.join(('trybot', gs_json_path,
-                             str(api.properties['issue'])))
+                             get_issue_num(api, builder_cfg)))
   api.gsutil.upload(
       name='upload raw coverage data',
       source=cov_file,
       bucket='skia-infra',
       dest='/'.join(('coverage-raw-v1', gs_json_path,
                      cov_file_basename)),
       env={'AWS_CREDENTIAL_FILE': None, 'BOTO_CONFIG': None},
   )
 
   # Transform the nanobench_${git_hash}.json file received from swarming bot
   # into the nanobench_${git_hash}_${timestamp}.json file
   # upload_bench_results.py expects.
   src_nano_file = results_dir.join('nanobench_%s.json' % got_revision)
   dst_nano_file = results_dir.join(
       'nanobench_%s_%s.json' % (got_revision, git_timestamp))
   api.file.copy('nanobench JSON', src_nano_file, dst_nano_file,
                 infra_step=True)
   api.file.remove('old nanobench JSON', src_nano_file)
 
   # Upload nanobench JSON data.
   gsutil_path = api.depot_tools.gsutil_py_path
   upload_args = [api.properties['buildername'], api.properties['buildnumber'],
                  results_dir, got_revision, gsutil_path]
   if is_trybot:
-    upload_args.append(api.properties['issue'])
+    upload_args.append(get_issue_num(api, builder_cfg))
   api.python(
       'upload nanobench coverage results',
       script=api.core.resource('upload_bench_results.py'),
       args=upload_args,
       cwd=api.path['checkout'],
       env=gsutil_env(api, 'chromium-skia-gm.boto'),
       infra_step=True)
 
   # Transform the coverage_by_line_${git_hash}.json file received from
   # swarming bot into a coverage_by_line_${git_hash}_${timestamp}.json file.
@@ skipping 120 matching lines @@
   is_trybot = builder_cfg['is_trybot']
 
   # Wait for results, then upload them if necessary.
 
   if test_task:
     test_steps_collect(api, test_task,
                        got_revision, is_trybot, builder_cfg)
 
   if perf_task:
     perf_steps_collect(api, perf_task,
-                       got_revision, is_trybot)
+                       got_revision, is_trybot, builder_cfg)
 
 
 def test_for_bot(api, builder, mastername, slavename, testname=None):
   """Generate a test for the given bot."""
   testname = testname or builder
   test = (
     api.test(testname) +
     api.properties(buildername=builder,
                    mastername=mastername,
                    slavename=slavename,
@@ skipping 39 matching lines @@
   test += api.path.exists(*paths)
 
   return test
 
 
 def GenTests(api):
   for mastername, slaves in TEST_BUILDERS.iteritems():
     for slavename, builders_by_slave in slaves.iteritems():
       for builder in builders_by_slave:
         yield test_for_bot(api, builder, mastername, slavename)
+
+  gerrit_kwargs = {
+    'patch_storage': 'gerrit',
+    'repository': 'skia',
+    'event.patchSet.ref': 'refs/changes/00/2100/2',
+    'event.change.number': '2100',
+  }
+  yield (
+      api.test('recipe_with_gerrit_patch') +
+      api.properties(
+          buildername='Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot',
+          mastername='client.skia',
+          slavename='skiabot-linux-swarm-000',
+          buildnumber=5,
+          path_config='kitchen',
+          revision='abc123',
+          **gerrit_kwargs) +
+      api.step_data(
+          'upload new .isolated file for test_skia',
+          stdout=api.raw_io.output('def456 XYZ.isolated'))
+  )