Replace builder_host and builder_port with builder_type.

tools/auto_bisect/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 170 matching lines @@
   # the DEPS file with the following format:
   # 'depot_name': 'revision',
   vars_body = re_results.group('vars_body')
   rxp = re.compile(r"'(?P<depot_body>[\w_-]+)':[\s]+'(?P<rev_body>[\w@]+)'",
                    re.MULTILINE)
   re_results = rxp.findall(vars_body)
 
   return dict(re_results)
 
 
-def _WaitUntilBuildIsReady(fetch_build_func, bot_name, builder_host,
-                           builder_port, build_request_id, max_timeout):
+def _WaitUntilBuildIsReady(fetch_build_func, bot_name, builder_type,
+                           build_request_id, max_timeout):
   """Waits until build is produced by bisect builder on try server.
 
   Args:
     fetch_build_func: Function to check and download build from cloud storage.
     bot_name: Builder bot name on try server.
-    builder_host Try server host name.
-    builder_port: Try server port.
+    builder_type: Builder type, e.g. "perf".

[RobertoCN, 2015/01/09 23:02:06]

Nit:

Will the list of acceptable builder_types be documented somewhere? If so, it
might be a good idea to point to such docco from this docstring. (Such as `refer
to constants defined in fetch_build...`)

     build_request_id: A unique ID of the build request posted to try server.
     max_timeout: Maximum time to wait for the build.
 
   Returns:
      Downloaded archive file path if exists, otherwise None.
   """
   # Build number on the try server.
   build_num = None
   # Interval to check build on cloud storage.
   poll_interval = 60
   # Interval to check build status on try server in seconds.
   status_check_interval = 600
   last_status_check = time.time()
   start_time = time.time()
   while True:
     # Checks for build on gs://chrome-perf and download if exists.
     res = fetch_build_func()
     if res:
       return (res, 'Build successfully found')
     elapsed_status_check = time.time() - last_status_check
     # To avoid overloading try server with status check requests, we check
     # build status for every 10 minutes.
     if elapsed_status_check > status_check_interval:
       last_status_check = time.time()
       if not build_num:
         # Get the build number on try server for the current build.
         build_num = request_build.GetBuildNumFromBuilder(
-            build_request_id, bot_name, builder_host, builder_port)
+            build_request_id, bot_name, builder_type)
       # Check the status of build using the build number.
       # Note: Build is treated as PENDING if build number is not found
       # on the the try server.
       build_status, status_link = request_build.GetBuildStatus(
-          build_num, bot_name, builder_host, builder_port)
+          build_num, bot_name, builder_type)
       if build_status == request_build.FAILED:
         return (None, 'Failed to produce build, log: %s' % status_link)
     elapsed_time = time.time() - start_time
     if elapsed_time > max_timeout:
       return (None, 'Timed out: %ss without build' % max_timeout)
 
     logging.info('Time elapsed: %ss without build.', elapsed_time)
     time.sleep(poll_interval)
     # For some reason, mac bisect bots were not flushing stdout periodically.
     # As a result buildbot command is timed-out. Flush stdout on all platforms
@@ skipping 653 matching lines @@
     build_timeout = self._GetBuilderBuildTime()
 
     try:
       _BuilderTryjob(git_revision, bot_name, build_request_id, deps_patch)
     except RunGitError as e:
       logging.warn('Failed to post builder try job for revision: [%s].\n'
                    'Error: %s', git_revision, e)
       return None
 
     archive_filename, error_msg = _WaitUntilBuildIsReady(
-        fetch_build_func, bot_name, self.opts.builder_host,
-        self.opts.builder_port, build_request_id, build_timeout)
+        fetch_build_func, bot_name, self.opts.builder_type, build_request_id,
+        build_timeout)
     if not archive_filename:
       logging.warn('%s [revision: %s]', error_msg, git_revision)
     return archive_filename
 
   @staticmethod
   def _GetBuilderName(target_platform, builder_type=fetch_build.PERF_BUILDER):
     """Gets builder bot name and build time in seconds based on platform."""
     if builder_type != fetch_build.PERF_BUILDER:
       raise NotImplementedError('No builder names for non-perf builds yet.')
     if bisect_utils.IsWindowsHost():
@@ skipping 91 matching lines @@
     if bisect_utils.IsWindowsHost():
       return 'full-build-win32'
     if bisect_utils.IsLinuxHost():
       return 'full-build-linux'
     if bisect_utils.IsMacHost():
       return 'full-build-mac'
     raise NotImplementedError('Unknown platform "%s".' % sys.platform)
 
   def IsDownloadable(self, depot):
     """Checks if build can be downloaded based on target platform and depot."""
-    if self.opts.target_platform in ['chromium', 'android']:
+    if (self.opts.target_platform in ['chromium', 'android']
+        and self.opts.builder_type == fetch_build.PERF_BUILDER):
       return (depot == 'chromium' or
               'chromium' in bisect_utils.DEPOT_DEPS_NAME[depot]['from'] or
               'v8' in bisect_utils.DEPOT_DEPS_NAME[depot]['from'])
     return False
 
   def UpdateDepsContents(self, deps_contents, depot, git_revision, deps_key):
     """Returns modified version of DEPS file contents.
 
     Args:
       deps_contents: DEPS file content.
@@ skipping 1475 matching lines @@
     self.no_custom_deps = False
     self.working_directory = None
     self.extra_src = None
     self.debug_ignore_build = None
     self.debug_ignore_sync = None
     self.debug_ignore_perf_test = None
     self.debug_ignore_regression_confidence = None
     self.debug_fake_first_test_mean = 0
     self.target_arch = 'ia32'
     self.target_build_type = 'Release'
-    self.builder_host = None
-    self.builder_port = None
+    self.builder_type = 'perf'
     self.bisect_mode = bisect_utils.BISECT_MODE_MEAN
     self.improvement_direction = 0
     self.bug_id = ''
 
   @staticmethod
   def _AddBisectOptionsGroup(parser):
     group = parser.add_argument_group('Bisect options')
     group.add_argument('-c', '--command', required=True,
                        help='A command to execute your performance test at '
                             'each point in the bisection.')
@@ skipping 81 matching lines @@
     group.add_argument('--output_buildbot_annotations', action='store_true',
                        help='Add extra annotation output for buildbot.')
     group.add_argument('--target_arch', default='ia32',
                        dest='target_arch', choices=['ia32', 'x64', 'arm'],
                        help='The target build architecture. Choices are "ia32" '
                             '(default), "x64" or "arm".')
     group.add_argument('--target_build_type', default='Release',
                        choices=['Release', 'Debug'],
                        help='The target build type. Choices are "Release" '
                             '(default), or "Debug".')
-    group.add_argument('--builder_host', dest='builder_host',
-                       help='Host address of server to produce build by '
-                            'posting try job request.')
-    group.add_argument('--builder_port', dest='builder_port', type=int,
-                       help='HTTP port of the server to produce build by '
-                            'posting try job request.')
+    group.add_argument('--builder_type', default=fetch_build.PERF_BUILDER,
+                       choices=[fetch_build.PERF_BUILDER,
+                                fetch_build.FULL_BUILDER],
+                       help='Type of builder to get build from. This '
+                            'determines both the bot that builds and the '
+                            'place where archived builds are downloaded from.')
 
   @staticmethod
   def _AddDebugOptionsGroup(parser):
     group = parser.add_argument_group('Debug options')
     group.add_argument('--debug_ignore_build', action='store_true',
                        help='DEBUG: Don\'t perform builds.')
     group.add_argument('--debug_ignore_sync', action='store_true',
                        help='DEBUG: Don\'t perform syncs.')
     group.add_argument('--debug_ignore_perf_test', action='store_true',
                        help='DEBUG: Don\'t perform performance tests.')
@@ skipping 158 matching lines @@
       # bugs. If you change this, please update the perf dashboard as well.
       bisect_utils.OutputAnnotationStepStart('Results')
     print 'Runtime Error: %s' % e
     if opts.output_buildbot_annotations:
       bisect_utils.OutputAnnotationStepClosed()
   return 1
 
 
 if __name__ == '__main__':
   sys.exit(main())