Make android-chrome bisect work with archives.

tools/auto_bisect/request_build.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.
 
 """This module contains functionality for starting build try jobs via HTTP.
 
 This includes both sending a request to start a job, and also related code
 for querying the status of the job.
 
 This module can be either run as a stand-alone script to send a request to a
@@ skipping 10 matching lines @@
 
 import fetch_build
 
 # URL template for fetching JSON data about builds.
 BUILDER_JSON_URL = ('%(server_url)s/json/builders/%(bot_name)s/builds/'
                     '%(build_num)s?as_text=1&filter=0')
 
 # URL template for displaying build steps.
 BUILDER_HTML_URL = '%(server_url)s/builders/%(bot_name)s/builds/%(build_num)s'
 
-# Try server status page URLs, used to get build status.
-PERF_TRY_SERVER_URL = 'http://build.chromium.org/p/tryserver.chromium.perf'
-LINUX_TRY_SERVER_URL = 'http://build.chromium.org/p/tryserver.chromium.linux'
-
 # Status codes that can be returned by the GetBuildStatus method
 # From buildbot.status.builder.
 # See: http://docs.buildbot.net/current/developer/results.html
 SUCCESS, WARNINGS, FAILURE, SKIPPED, EXCEPTION, RETRY, TRYPENDING = range(7)
 OK = (SUCCESS, WARNINGS)  # These indicate build is complete.
 FAILED = (FAILURE, EXCEPTION, SKIPPED)  # These indicate build failure.
 PENDING = (RETRY, TRYPENDING)  # These indicate in progress or in pending queue.
 
 
 class ServerAccessError(Exception):
@@ skipping 99 matching lines @@
 
   Returns:
     A dictionary with build information if build exists, otherwise None.
   """
   builds_json = _FetchBuilderData(buildbot_url)
   if builds_json:
     return json.loads(builds_json)
   return None
 
 
-def _GetBuildBotUrl(builder_type):
-  """Gets build bot URL for fetching build info.
-
-  Bisect builder bots are hosted on tryserver.chromium.perf, though we cannot
-  access this tryserver using host and port number directly, so we use another
-  tryserver URL for the perf tryserver.
-
-  Args:
-    builder_type: Determines what type of builder is used, e.g. "perf".
-
-  Returns:
-    URL of the buildbot as a string.
-  """
-  if builder_type == fetch_build.PERF_BUILDER:
-    return PERF_TRY_SERVER_URL
-  if builder_type == fetch_build.FULL_BUILDER:
-    return LINUX_TRY_SERVER_URL
-  raise NotImplementedError('Unsupported builder type "%s".' % builder_type)
-
-
-def GetBuildStatus(build_num, bot_name, builder_type):
+def GetBuildStatus(build_num, bot_name, server_url):
   """Gets build status from the buildbot status page for a given build number.
 
   Args:
     build_num: A build number on tryserver to determine its status.
     bot_name: Name of the bot where the build information is scanned.
-    builder_type: Type of builder, e.g. "perf".
+    server_url: URL of the buildbot.
 
   Returns:
     A pair which consists of build status (SUCCESS, FAILED or PENDING) and a
     link to build status page on the waterfall.
   """
-  # TODO(prasadv, qyearsley): Make this a method of BuildArchive
-  # (which may be renamed to BuilderTryBot or Builder).
   results_url = None
   if build_num:
     # Get the URL for requesting JSON data with status information.
-    server_url = _GetBuildBotUrl(builder_type)
     buildbot_url = BUILDER_JSON_URL % {
         'server_url': server_url,
         'bot_name': bot_name,
         'build_num': build_num,
     }
     build_data = _GetBuildData(buildbot_url)
     if build_data:
       # Link to build on the buildbot showing status of build steps.
       results_url = BUILDER_HTML_URL % {
           'server_url': server_url,
           'bot_name': bot_name,
           'build_num': build_num,
       }
       if _IsBuildFailed(build_data):
         return (FAILED, results_url)
 
       elif _IsBuildSuccessful(build_data):
         return (OK, results_url)
   return (PENDING, results_url)
 
 
-def GetBuildNumFromBuilder(build_reason, bot_name, builder_type):
+def GetBuildNumFromBuilder(build_reason, bot_name, server_url):
   """Gets build number on build status page for a given 'build reason'.
 
   This function parses the JSON data from buildbot page and collects basic
   information about the all the builds, and then uniquely identifies the build
   based on the 'reason' attribute in builds's JSON data.
 
   The 'reason' attribute set is when a build request is posted, and it is used
   to identify the build on status page.
 
   Args:
     build_reason: A unique build name set to build on tryserver.
     bot_name: Name of the bot where the build information is scanned.
-    builder_type: Type of builder, e.g. "perf".
+    server_url: URL of the buildbot.
 
   Returns:
     A build number as a string if found, otherwise None.
   """
-  # TODO(prasadv, qyearsley): Make this a method of BuildArchive
-  # (which may be renamed to BuilderTryBot or Builder).
-  # Gets the buildbot url for the given host and port.
-  server_url = _GetBuildBotUrl(builder_type)
   buildbot_url = BUILDER_JSON_URL % {
       'server_url': server_url,
       'bot_name': bot_name,
       'build_num': '_all',
   }
   builds_json = _FetchBuilderData(buildbot_url)
   if builds_json:
     builds_data = json.loads(builds_json)
     for current_build in builds_data:
       if builds_data[current_build].get('reason') == build_reason:
         return builds_data[current_build].get('number')
   return None