From: Zack Cerza <zack@redhat.com>
Date: Fri, 24 Apr 2015 16:01:30 +0000 (-0600)
Subject: Fix branch selection logic
X-Git-Tag: 1.1.0~960^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F474%2Fhead;p=teuthology.git

Fix branch selection logic

Signed-off-by: Zack Cerza <zack@redhat.com>
---

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