From 074741e317cb4a8ef60349ee496b995218bdf3c7 Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Fri, 24 Apr 2015 10:01:30 -0600 Subject: [PATCH] Fix branch selection logic Signed-off-by: Zack Cerza --- teuthology/suite.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/teuthology/suite.py b/teuthology/suite.py index feb143c54..214d2a5c9 100644 --- a/teuthology/suite.py +++ b/teuthology/suite.py @@ -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 -- 2.47.3