bisection: prepare for running under remote_run

scripts/slave/recipe_modules/auto_bisect/api.py

 # Copyright 2015 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.
 
 """API for the bisect recipe module.
 
 This API is meant to enable the bisect recipe to bisect any chromium-supported
 platform for any test that can be run via buildbot, perf or otherwise.
 """
 
@@ skipping 144 matching lines @@
     except self.m.step.StepFailure:  # pragma: no cover
      self.surface_result('BAD_REV')
      raise
 
   def run_bisect_script(self, **kwargs):
     """Executes src/tools/run-perf-bisect-regression.py to perform bisection."""
     self.m.python(
         'Preparing for Bisection',
         script=self.m.path['checkout'].join(
             'tools', 'prepare-bisect-perf-regression.py'),
-        args=['-w', self.m.path['slave_build']])
+        args=['-w', self.m.path['cache'].join('bisect')])
     args = []
 
     kwargs['allow_subannotations'] = True
 
     # TODO(prasadv): Remove this once bisect runs are no longer running
     # against revisions from February 2016 or earlier.
     if self.internal_bisect:  # pragma: no cover
       kwargs['env'] = {'CHROMIUM_OUTPUT_DIR': self.m.chromium.output_dir}
 
     if kwargs.get('extra_src'):
       args = args + ['--extra_src', kwargs.pop('extra_src')]
     if kwargs.get('path_to_config'):
       args = args + ['--path_to_config', kwargs.pop('path_to_config')]
     if self.m.chromium.c.TARGET_PLATFORM != 'android':
-      # TODO(phajdan.jr): update for swarming, http://crbug.com/585401 .

[tandrii(chromium), 2016/08/08 12:58:12]

no longer valid, or should 585401 this be referenced in BUG= above?

[Paweł Hajdan Jr., 2016/08/08 12:59:14]

Ah, I added it to BUG= line.

-      args += ['--path_to_goma', self.m.path['build'].join('goma')]
+      goma_dir = self.m.goma.ensure_goma()
+      args += ['--path_to_goma', goma_dir]
     args += [
         '--build-properties',
         self.m.json.dumps(dict(self.m.properties.legacy())),
     ]
     self.m.chromium.runtest(
         self.m.path['checkout'].join('tools', 'run-bisect-perf-regression.py'),
-        ['-w', self.m.path['slave_build']] + args,
+        ['-w', self.m.path['cache'].join('bisect')] + args,
         name='Running Bisection',
         xvfb=True, **kwargs)
 
   def run_local_test_run(self, test_config_params,
                          skip_download=False):  # pragma: no cover
     """Starts a test run on the same machine.
 
     This is for the merged director/tester flow.
     """
     if self.m.platform.is_win:
       self.m.chromium.taskkill()
 
     if skip_download:
       update_step = None
     else:
       update_step = self._SyncRevisionToTest(test_config_params)
     self.start_test_run_for_bisect(update_step, self.bot_db,
                                    test_config_params, run_locally=True,
                                    skip_download=skip_download)
 
+  def ensure_checkout(self, *args, **kwargs):
+    checkout_dir = self.m.chromium_tests.get_checkout_dir({})
+    if checkout_dir:
+      kwargs.setdefault('cwd', checkout_dir)
+
+    return self.m.bot_update.ensure_checkout(*args, **kwargs)
+
   def _SyncRevisionToTest(self, test_config_params):  # pragma: no cover
     if not self.internal_bisect:
-      return self.m.bot_update.ensure_checkout(
+      return self.ensure_checkout(
           root_solution_revision=test_config_params['revision'])
     else:
       return self._SyncRevisionsForAndroidChrome(
           test_config_params['revision_ladder'])
 
   def _SyncRevisionsForAndroidChrome(self, revision_ladder):  # pragma: no cover
     """Syncs android-chrome and chromium repos to particular revision."""
     revisions = []
     for d, r in revision_ladder.iteritems():
       revisions.append('%s@%s' % (depot_config.DEPOT_DEPS_NAME[d]['src'], r))
@@ skipping 164 matching lines @@
         api.step('***PERF TRYJOB***', [])
         self.m.perf_try.start_perf_try_job(
             affected_files, update_step, self.bot_db)
     finally:
       if api.chromium.c.TARGET_PLATFORM == 'android':
         if self.internal_bisect:  # pragma: no cover
           api.chromium_android.init_and_sync(
               gclient_config=api.chromium_android.c.internal_dir_name,
               use_bot_update=True)
         else:
-          api.bot_update.ensure_checkout()
+          self.ensure_checkout()
         api.chromium_android.common_tests_final_steps()