Skia: Run recipes as swarming tasks

scripts/slave/recipe_modules/skia/api.py

 # Copyright 2014 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.
 
 
 import json
 import os
 import re
 import sys
 
@@ skipping 321 matching lines @@
 
   def _writefile(self, filename, contents):
     """Convenience function for writing files."""
     return self.m.file.write('write %s' % self.m.path.basename(filename),
                              filename, contents, infra_step=True)
 
   def rmtree(self, path):
     """Wrapper around api.file.rmtree with environment fix."""
     env = {}
     if self.running_in_swarming:
-      env['PYTHONPATH'] = str(self.skia_dir.join('infra', 'bots', 'build',
-                                                 'scripts'))
+      env['PYTHONPATH'] = str(self.m.path.join('build', 'scripts'))
     self.m.file.rmtree(self.m.path.basename(path),
                        path,
                        env=env,
                        infra_step=True)
 
   def run(self, steptype, name, abort_on_failure=True,
           fail_build_on_failure=True, env=None, **kwargs):
     """Run a step. If it fails, keep going but mark the build status failed."""
     env = dict(env or {})
     env.update(self.default_env)
@@ skipping 13 matching lines @@
         source=source,
         bucket=bucket,
         dest=dest,
         args=['-R'],
         env=self.gsutil_env_skia_infra,
         abort_on_failure=False)
 
   def _download_and_copy_dir(self, version_file, gs_path_tmpl, host_path,
                              device_path, test_expected_version,
                              test_actual_version):
+    actual_version_file = self.m.path.join(self.tmp_dir, version_file)
     # If we're running as a Swarming task, we should've received the test inputs
     # via the isolate server. Only download if we're not running in Swarming.
-    if self.running_in_swarming:
-      actual_version_file = self.m.path.join(host_path, version_file)
-    else:
+    if not self.running_in_swarming:
       # Ensure that the tmp_dir exists.
       self._run_once(self.m.file.makedirs,
                      'tmp_dir',
                      self.tmp_dir,
                      infra_step=True)
-      actual_version_file = self.m.path.join(self.tmp_dir, version_file)
 
     # Find the actually-downloaded version.
     try:
       actual_version = self._readfile(actual_version_file,
                                       name='Get downloaded %s' % version_file,
                                       test_data=test_actual_version).rstrip()
     except self.m.step.StepFailure:
       if self.running_in_swarming:
         raise  # pragma: no cover
       actual_version = VERSION_NONE
@@ skipping 18 matching lines @@
             global_constants.GS_GM_BUCKET,
             (gs_path_tmpl % expected_version) + '/*',
             host_path,
             name='download %s' % self.m.path.basename(host_path),
             args=['-R'],
             env=self.gsutil_env_chromium_skia_gm)
         self._writefile(actual_version_file, expected_version)
         actual_version = expected_version
 
     # Copy to device.
-    if self.running_in_swarming:
-      device_version_file = self.flavor.device_path_join(
-          device_path, version_file)
-    else:
-      device_version_file = self.flavor.device_path_join(
-          self.device_dirs.tmp_dir, version_file)
+    device_version_file = self.flavor.device_path_join(
+        self.device_dirs.tmp_dir, version_file)
     if str(actual_version_file) != str(device_version_file):
       try:
         device_version = self.flavor.read_file_on_device(device_version_file)
       except self.m.step.StepFailure:
         device_version = VERSION_NONE
       if device_version != actual_version:
         self.flavor.remove_file_on_device(device_version_file)
         self.flavor.create_clean_device_dir(device_path)
         self.flavor.copy_directory_contents_to_device(host_path, device_path)
 
@@ skipping 355 matching lines @@
     # Don't bother to include role, which is always Test.
     # TryBots are uploaded elsewhere so they can use the same key.
     blacklist = ['role', 'is_trybot']
 
     flat = []
     for k in sorted(self.builder_cfg.keys()):
       if k not in blacklist:
         flat.append(k)
         flat.append(self.builder_cfg[k])
     return flat