Merge branch 'master' of github.com:mozilla/mozilla_ci_tools

ka7 · Jul 13, 2016 · 0fb3576 · 0fb3576
2 parents 16b8d62 + fbdaa34
commit 0fb3576
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/mozci/query_jobs.py b/mozci/query_jobs.py
@@ -222,8 +222,13 @@ def find_all_jobs_by_status(self, repo_name, revision, status):
 
 class TreeherderApi(QueryApi):
 
-    def __init__(self, treeherder_host='treeherder.mozilla.org'):
-        self.treeherder_client = TreeherderClient(host=treeherder_host)
+    def __init__(self, server_url='https://treeherder.mozilla.org', treeherder_host=None):
+        if treeherder_host:
+            LOG.warning("The `TreeherderApi()` parameter `treeherder_host` is deprecated. "
+                        "Use `server_url` instead, or omit entirely to use the default of "
+                        "production Treeherder.")
+            server_url = 'https://%s' % treeherder_host
+        self.treeherder_client = TreeherderClient(server_url=server_url)
 
     def get_all_jobs(self, repo_name, revision, **params):
         """

diff --git a/mozci/repositories.py b/mozci/repositories.py
@@ -11,7 +11,6 @@
 
 LOG = logging.getLogger('mozci')
 REPOSITORIES = {}
-TREEHERDER_URL = 'treeherder.mozilla.org'
 
 
 #
@@ -61,7 +60,7 @@ def query_repositories(clear_cache=False):
     if REPOSITORIES:
         return REPOSITORIES
 
-    th_client = TreeherderClient(protocol='https', host=TREEHERDER_URL)
+    th_client = TreeherderClient()
     treeherderRepos = th_client.get_repositories()
     REPOSITORIES = {}
     for th_repo in treeherderRepos:

diff --git a/setup.py b/setup.py
@@ -9,7 +9,7 @@
     "pushlog_client",
     "requests",
     "taskcluster",
-    "treeherder-client",
+    "treeherder-client>=3.0.0",
     "jsonschema",
     "pyyaml"
 ]