Add key params for buildbotless bots in DM/nanobench

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 17 matching lines @@
     self.master_name = self.m.properties['mastername']
     self.slave_name = self.m.properties['slavename']
     self.build_number = self.m.properties['buildnumber']
 
     self.slave_dir = self.m.path['slave_build']
     self.checkout_root = self.slave_dir
     self.default_env = {}
     self.gclient_env = {}
     self.is_compile_bot = self.builder_name.startswith('Build-')
     self.no_buildbot = self.m.properties.get('nobuildbot', '') == 'True'
+    self.skia_task_id = self.m.properties.get('skia_task_id', None)
 
     self.default_env['CHROME_HEADLESS'] = '1'
     # The 'depot_tools' directory comes from recipe DEPS and isn't provided by
     # default. We have to set it manually.
     self.m.path.c.base_paths['depot_tools'] = (
         self.m.path.c.base_paths['slave_build'] +
         ('skia', 'infra', 'bots', '.recipe_deps', 'depot_tools'))
     if 'Win' in self.builder_name:
       self.m.path.c.base_paths['depot_tools'] = (
           'c:\\', 'Users', 'chrome-bot', 'depot_tools')
@@ skipping 58 matching lines @@
     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.patch_storage = self.m.properties.get('patch_storage', 'rietveld')
     self.issue = None
     self.patchset = None
     if self.no_buildbot:
-      self.is_trybot = (
-          self.m.properties.get('issue', '') and
-          self.m.properties.get('patchset', ''))
-      if self.is_trybot:
+      if (self.m.properties.get('issue', '') and
+          self.m.properties.get('patchset', '')):
+        self.is_trybot = True
         self.issue = self.m.properties['issue']
         self.patchset = self.m.properties['patchset']
+      elif (self.m.properties.get('event.change.number', '') and
+            self.m.properties.get('event.patchSet.ref', '')):
+        self.is_trybot = True
+        self.issue = self.m.properties['event.change.number']
+        self.patchset = self.m.properties['event.patchSet.ref'].split('/')[-1]
     else:
       self.is_trybot = self.builder_cfg['is_trybot']
       if self.is_trybot:
         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')
+    self._swarming_bot_id = None
+    self._swarming_task_id = None
 
   @property
   def upload_dm_results(self):
     # TODO(borenet): Move this into the swarm_test recipe.
     skip_upload_bots = [
       'ASAN',
       'Coverage',
       'MSAN',
       'TSAN',
       'UBSAN',
@@ skipping 18 matching lines @@
       'TSAN',
       'UBSAN',
       'Valgrind',
     ]
     upload_perf_results = True
     for s in skip_upload_bots:
       if s in self.m.properties['buildername']:
         upload_perf_results = False
         break
     return upload_perf_results
+
+  @property
+  def swarming_bot_id(self):
+    if not self._swarming_bot_id:
+      self._swarming_bot_id = self.m.python.inline(
+          name='get swarming bot id',
+          program='''import os
+print os.environ.get('SWARMING_BOT_ID', '')
+''',
+          stdout=self.m.raw_io.output()).stdout.rstrip()
+    return self._swarming_bot_id
+
+  @property
+  def swarming_task_id(self):
+    if not self._swarming_task_id:
+      self._swarming_task_id = self.m.python.inline(
+          name='get swarming task id',
+          program='''import os
+print os.environ.get('SWARMING_TASK_ID', '')
+''',
+          stdout=self.m.raw_io.output()).stdout.rstrip()
+    return self._swarming_task_id
+