Fix recipes for Gerrit property rename

infra/bots/recipes/upload_nano_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 nanobench results.
 
 
 DEPS = [
   'build/file',
@@ skipping 25 matching lines @@
   basename = api.path.basename(src)
   gs_path = '/'.join((
       'nano-json-v1', str(now.year).zfill(4),
       str(now.month).zfill(2), str(now.day).zfill(2), str(now.hour).zfill(2),
       builder_name))
 
   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]
+    issue = str(api.properties['patch_issue'])
+    patchset = str(api.properties['patch_ref']).split('/')[-1]
   if issue and patchset:
     gs_path = '/'.join(('trybot', gs_path, issue, patchset))
 
   dst = '/'.join(('gs://skia-perf', gs_path, basename))
 
   api.step('upload',
            cmd=['gsutil', 'cp', '-a', 'public-read', '-z', 'json', src, dst],
            infra_step=True)
 
 
 def GenTests(api):
   builder = 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug'
   yield (
     api.test('normal_bot') +
     api.properties(buildername=builder,
                    revision='abc123',
                    path_config='kitchen')
   )
 
   builder = 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot'
   yield (
     api.test('trybot') +
     api.properties(buildername=builder,
                    revision='abc123',
                    path_config='kitchen',
                    issue='12345',
                    patchset='1002')
   )
 
-  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=builder,
           revision='abc123',
           path_config='kitchen',
-          **gerrit_kwargs)
+          patch_storage='gerrit') +
+      api.properties.tryserver(
+          buildername=builder,
+          gerrit_project='skia',
+          gerrit_url='https://skia-review.googlesource.com/',
+      )
   )