Skip to content

teuthology: add the function of specifying teuthology url #1838

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

teuthology: add the function of specifying teuthology url #1838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions teuthology/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ class TeuthologyConfig(YamlConfig):
'koji_task_url': 'https://kojipkgs.fedoraproject.org/work/',
'baseurl_template': 'http://{host}/{proj}-{pkg_type}-{dist}-{arch}-{flavor}/{uri}',
'use_shaman': True,
'teuthology_git_url': 'https://github.com/ceph/teuthology.git',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be None by default, same as ceph_git_url and others.

'shaman_host': 'shaman.ceph.com',
'teuthology_path': None,
'suite_verify_ceph_hash': True,
Expand Down Expand Up @@ -209,6 +210,9 @@ def get_ceph_qa_suite_git_url(self):
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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this might be the same as the other similar methods, like:

        return (self.teuthology_git_url or
                 self.ceph_git_base_url + 'teuthology.git')




class JobConfig(YamlConfig):
Expand Down
2 changes: 2 additions & 0 deletions teuthology/repo_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,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