RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-29 14:34:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix branch selection logic

Browse Source 
Signed-off-by: Zack Cerza <zack@redhat.com>
This commit is contained in:
Zack Cerza 2015-04-24 10:01:30 -06:00
parent 3ac42e045f
commit 074741e317
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
teuthology/suite.py
View File

@ -199,7 +199,7 @@ def create_initial_config(suite, suite_branch, ceph_branch, teuthology_branch,
if not get_branch_info('teuthology', teuthology_branch):
exc = BranchNotFoundError(teuthology_branch, 'teuthology.git')
schedule_fail(message=str(exc), name=name)
else:
elif not teuthology_branch:
# Decide what branch of teuthology to use
if get_branch_info('teuthology', ceph_branch):
teuthology_branch = ceph_branch
@ -213,7 +213,7 @@ def create_initial_config(suite, suite_branch, ceph_branch, teuthology_branch,
if not get_branch_info('ceph-qa-suite', suite_branch):
exc = BranchNotFoundError(suite_branch, 'ceph-qa-suite.git')
schedule_fail(message=str(exc), name=name)
else:
elif not suite_branch:
# Decide what branch of ceph-qa-suite to use
if get_branch_info('ceph-qa-suite', ceph_branch):
suite_branch = ceph_branch