rebaseline_server: allow user to specify which builders to process

gm/rebaseline_server/compare_configs.py

 #!/usr/bin/python

[epoger, 2014/04/10 03:49:29]

In some ways, this CL is not the best solution to either http://skbug.com/1543
or http://skbug.com/1915 .  But it helps with both of them, and also makes
rebaseline_server faster to test (by skipping most builders).

 
 """

[epoger, 2014/04/10 03:49:29]

An example command line using this new argument is:

gm/rebaseline_server/server.py --builders '.*Mac10.6.*' '.*Android.*'

Which would process Mac10.6 bots and Android bots.

 Copyright 2014 Google Inc.
 
 Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file.
 
 Compare GM results for two configs, across all builders.
 """
 
 # System-level imports
 import argparse
@@ skipping 26 matching lines @@
 import imagediffdb
 import imagepair
 import imagepairset
 import results
 
 
 class ConfigComparisons(results.BaseComparisons):
   """Loads results from two different configurations into an ImagePairSet.
 
   Loads actual and expected results from all builders, except for those skipped
-  by BaseComparisons._ignore_builder().
+  by _ignore_builder().
   """
 
   def __init__(self, configs, actuals_root=results.DEFAULT_ACTUALS_DIR,
                generated_images_root=results.DEFAULT_GENERATED_IMAGES_ROOT,
-               diff_base_url=None):
+               diff_base_url=None, builder_regex_list=None):
     """
     Args:
       configs: (string, string) tuple; pair of configs to compare
       actuals_root: root directory containing all actual-results.json files
       generated_images_root: directory within which to create all pixel diffs;
           if this directory does not yet exist, it will be created
       diff_base_url: base URL within which the client should look for diff
           images; if not specified, defaults to a "file:///" URL representation
           of generated_images_root
+      builder_regex_list: List of regular expressions specifying which builders
+          we will process. If None, process all builders.
     """
     time_start = int(time.time())
+    if builder_regex_list != None:
+      self.set_match_builders_pattern_list(builder_regex_list)
     self._image_diff_db = imagediffdb.ImageDiffDB(generated_images_root)
     self._diff_base_url = (
         diff_base_url or
         download_actuals.create_filepath_url(generated_images_root))
     self._actuals_root = actuals_root
     self._load_config_pairs(configs)
     self._timestamp = int(time.time())
     logging.info('Results complete; took %d seconds.' %
                  (self._timestamp - time_start))
 
   def _load_config_pairs(self, configs):
     """Loads the results of all tests, across all builders (based on the
     files within self._actuals_root), compares them across two configs,
     and stores the summary in self._results.
 
     Args:
       configs: tuple of strings; pair of configs to compare
     """
     logging.info('Reading actual-results JSON files from %s...' %
                  self._actuals_root)
-    actual_builder_dicts = ConfigComparisons._read_dicts_from_root(
-        self._actuals_root)
+    actual_builder_dicts = self._read_dicts_from_root(self._actuals_root)
     configA, configB = configs
     logging.info('Comparing configs %s and %s...' % (configA, configB))
 
     all_image_pairs = imagepairset.ImagePairSet(
         descriptions=configs,
         diff_base_url=self._diff_base_url)
     failing_image_pairs = imagepairset.ImagePairSet(
         descriptions=configs,
         diff_base_url=self._diff_base_url)
 
@@ skipping 111 matching lines @@
   results_obj = ConfigComparisons(configs=args.config,
                                   actuals_root=args.actuals,
                                   generated_images_root=args.workdir)
   gm_json.WriteToFile(
       results_obj.get_packaged_results_of_type(results_type=args.results),
       args.outfile)
 
 
 if __name__ == '__main__':
   main()