Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions docs/siteconfig.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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: .

Expand Down
5 changes: 5 additions & 0 deletions teuthology/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -220,6 +221,10 @@ def get_ceph_git_url(self):
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
Expand Down
4 changes: 3 additions & 1 deletion teuthology/repo_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)


Expand Down
Loading