Apply gerrit ref if it is a Gerrit patch

infra/bots/recipe_modules/vars/api.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.
 
 
 # pylint: disable=W0201
 
 
 from recipe_engine import recipe_api
 
@@ skipping 92 matching lines @@
       self.configuration = CONFIG_RELEASE
     else:
       self.configuration = self.builder_cfg.get('configuration', CONFIG_DEBUG)
     arch = (self.builder_cfg.get('arch') or self.builder_cfg.get('target_arch'))
     if ('Win' in self.builder_cfg.get('os', '') and arch == 'x86_64'):
       self.configuration += '_x64'
 
     self.default_env.update({'SKIA_OUT': self.skia_out,
                              'BUILDTYPE': self.configuration})
     self.is_trybot = self.builder_cfg['is_trybot']
+    self.patch_storage = self.m.properties.get('patch_storage', '')
     self.issue = None
     self.patchset = None
-    self.rietveld = None
     if self.is_trybot:
-      self.issue = self.m.properties['issue']
-      self.patchset = self.m.properties['patchset']
-      self.rietveld = self.m.properties['rietveld']
+      if self.patch_storage == 'gerrit':
+        self.issue = self.m.properties['event.change.number']
+        self.patchset = self.m.properties['event.patchSet.ref'].split('/')[-1]
+      else:
+        self.issue = self.m.properties['issue']
+        self.patchset = self.m.properties['patchset']
     self.dm_dir = self.m.path.join(
         self.swarming_out_dir, 'dm')
     self.perf_data_dir = self.m.path.join(self.swarming_out_dir,
         'perfdata', self.builder_name, 'data')
 
   @property
   def upload_dm_results(self):
     # TODO(borenet): Move this into the swarm_test recipe.
     skip_upload_bots = [
       'ASAN',
       'Coverage',
       'MSAN',
       'TSAN',
       'UBSAN',
       'Valgrind',
     ]
     upload_dm_results = True
     for s in skip_upload_bots:
       if s in self.m.properties['buildername']:
         upload_dm_results = False
         break
     return upload_dm_results
 
   @property
   def upload_perf_results(self):
     # TODO(borenet): Move this into the swarm_perf recipe.
     return ('Release' in self.m.properties['buildername'])