Enable downloading archive only for Desktop builds

tools/bisect-perf-regression.py

 #!/usr/bin/env python
 # Copyright (c) 2013 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.
 
 """Performance Test Bisect Tool
 
 This script bisects a series of changelists using binary search. It starts at
 a bad revision where a performance metric has regressed, and asks for a last
 known-good revision. It will then binary search across this revision range by
@@ skipping 1487 matching lines @@
         elapsed_time = time.time() - start_time
         if elapsed_time > build_timeout:
           raise RuntimeError('Timed out while waiting %ds for %s build.' %
                              (build_timeout, revision))
         print ('Time elapsed: %ss, still waiting for %s build' %
                (elapsed_time, revision))
         time.sleep(poll_interval)
     return False
 
   def IsDownloadable(self, depot):
-    """Checks if we can download builds for the depot from cloud."""
-    return (depot == 'chromium' or 'chromium' in DEPOT_DEPS_NAME[depot]['from']
-        or 'v8' in DEPOT_DEPS_NAME[depot]['from'])
+    """Checks if build is downloadable based on target platform and depot."""
+    if self.opts.target_platform in ['chromium'] and self.opts.gs_bucket:
+      return (depot == 'chromium' or
+              'chromium' in DEPOT_DEPS_NAME[depot]['from'] or
+              'v8' in DEPOT_DEPS_NAME[depot]['from'])
+    return False

[qyearsley, 2014/04/10 19:14:46]

I guess this could theoretically also be written as

return (self.opts.target_platform in ['chromium'] and
        self.opts.gs_bucket and
        (depot == 'chromium' or
        'chromium' in DEPOT_DEPS_NAME[depot]['from'] or
        'v8' in DEPOT_DEPS_NAME[depot]['from']))

But that wouldn't necessarily make it any clearer.

 
   def UpdateDeps(self, revision, depot, deps_file):
     """Updates DEPS file with new revision of dependency repository.
 
     This method search DEPS for a particular pattern in which depot revision
     is specified (e.g "webkit_revision": "123456"). If a match is found then
     it resolves the given git hash to SVN revision and replace it in DEPS file.
 
     Args:
       revision: A git hash revision of the dependency repository.
@@ skipping 166 matching lines @@
 
     Returns:
       True if the build was successful.
     """
     if self.opts.debug_ignore_build:
       return True
     cwd = os.getcwd()
     os.chdir(self.src_cwd)
     # Fetch build archive for the given revision from the cloud storage when
     # the storage bucket is passed.
-    if self.IsDownloadable(depot) and self.opts.gs_bucket and revision:
+    if self.IsDownloadable(depot) and revision:
       deps_patch = None
       if depot != 'chromium':
         # Create a DEPS patch with new revision for dependency repository.
         (revision, deps_patch) = self.CreateDEPSPatch(depot, revision)
       # Get SVN revision for the given SHA, since builds are archived using SVN
       # revision.
       chromium_revision = self.source_control.SVNFindRev(revision)
       if not chromium_revision:
         raise RuntimeError(
             'Failed to determine SVN revision for %s' % revision)
@@ skipping 490 matching lines @@
           return ('Skipped revision: [%s]' % str(revision),
               BUILD_RESULT_SKIPPED)
 
         start_build_time = time.time()
         if self.BuildCurrentRevision(depot, revision):
           after_build_time = time.time()
           results = self.RunPerformanceTestAndParseResults(command_to_run,
                                                            metric)
           # Restore build output directory once the tests are done, to avoid
           # any descrepancy.
-          if depot == 'chromium' and self.opts.gs_bucket and revision:
+          if self.IsDownloadable(depot) and revision:
             self.BackupOrRestoreOutputdirectory(restore=True)
 
           if results[1] == 0:
             external_revisions = self.Get3rdPartyRevisionsFromCurrentRevision(
                 depot, revision)
 
             if not external_revisions is None:
               return (results[0], results[1], external_revisions,
                   time.time() - after_build_time, after_build_time -
                   start_build_time)
@@ skipping 1419 matching lines @@
       # The perf dashboard scrapes the "results" step in order to comment on
       # bugs. If you change this, please update the perf dashboard as well.
       bisect_utils.OutputAnnotationStepStart('Results')
     print 'Error: %s' % e.message
     if opts.output_buildbot_annotations:
       bisect_utils.OutputAnnotationStepClosed()
   return 1
 
 if __name__ == '__main__':
   sys.exit(main())