1 files changed, 8 insertions, 9 deletions
diff --git a/infra/bots/recipes/upload_nano_results.py b/infra/bots/recipes/upload_nano_results.py
index 50883e7c05..cf71fdcd67 100644
--- a/infra/bots/recipes/upload_nano_results.py
+++ b/infra/bots/recipes/upload_nano_results.py
@@ -43,8 +43,8 @@ def RunSteps(api):
   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))
 
@@ -74,17 +74,16 @@ def GenTests(api):
                    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/',
+      )
   )