teuthology/config: add teuthology_git_url option

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@clyso.com>

diff --git a/docs/siteconfig.rst b/docs/siteconfig.rst
index effb8219c227aa2772bdb709e8447da210d26c12..5de2bda53945b224c73fefcacf9574c62b49340f 100644 (file)
--- a/docs/siteconfig.rst
+++ b/docs/siteconfig.rst
@@ -74,6 +74,9 @@ Here is a sample configuration with many of the options set and documented::
     # Where teuthology and ceph-qa-suite repos should be stored locally
     src_base_path: /home/foo/src
 
+    # Where the teuthology git repo is considered to reside.
+    teuthology_git_url: https://github.com/ceph/teuthology.git
+
     # Where teuthology path is located: do not clone if present
     #teuthology_path: .
 

diff --git a/teuthology/config.py b/teuthology/config.py
index c2157bb0ac02753593477d8ac6b6d31b50ee2466..241b1021362455858b79ff1abf05a29ede0ac700 100644 (file)
--- a/teuthology/config.py
+++ b/teuthology/config.py
@@ -155,6 +155,7 @@ class TeuthologyConfig(YamlConfig):
         'ceph_git_url': None,
         'ceph_qa_suite_git_url': None,
         'ceph_cm_ansible_git_url': None,
+        'teuthology_git_url': None,
         'use_conserver': False,
         'conserver_master': 'conserver.front.sepia.ceph.com',
         'conserver_port': 3109,
@@ -220,6 +221,10 @@ class TeuthologyConfig(YamlConfig):
         return (self.ceph_git_url or
                 self.ceph_git_base_url + 'ceph-ci.git')
 
+    def get_teuthology_git_url(self):
+        return (self.teuthology_git_url or
+                self.ceph_git_base_url + 'teuthology.git')
+
 
 class JobConfig(YamlConfig):
     pass

diff --git a/teuthology/repo_utils.py b/teuthology/repo_utils.py
index 79fd92edaa20456741524318bc4fb11d9212de40..db6e87a8c7138cfffdd7264da51e70d944790e54 100644 (file)
--- a/teuthology/repo_utils.py
+++ b/teuthology/repo_utils.py
@@ -51,6 +51,8 @@ def build_git_url(project, project_owner='ceph'):
         base = config.get_ceph_cm_ansible_git_url()
     elif project == 'ceph':
         base = config.get_ceph_git_url()
+    elif project == 'teuthology':
+        base = config.get_teuthology_git_url()
     else:
         base = 'https://github.com/{project_owner}/{project}'
     url_templ = re.sub(r'\.git$', '', base)
@@ -435,7 +437,7 @@ def fetch_teuthology(branch, commit=None, lock=True):
     :param commit: The sha1 to checkout. Defaults to None, which uses HEAD of the branch.
     :returns:      The destination path
     """
-    url = config.ceph_git_base_url + 'teuthology.git'
+    url = config.get_teuthology_git_url()
     return fetch_repo(url, branch, commit, bootstrap_teuthology, lock)