Fall back to master for suite_branch

The reason for this is that last-in-suite jobs don't have suite_branch
or branch set. We just want to use master for those.

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

diff --git a/teuthology/worker.py b/teuthology/worker.py
index 45ffe01ea71a7938121c418b6e150364635cff8c..358cc36cabdda14a0dc50249250ccd181311661a 100644 (file)
--- a/teuthology/worker.py
+++ b/teuthology/worker.py
@@ -191,7 +191,10 @@ def main(ctx):
 
         try:
             teuth_path = fetch_teuthology_branch(branch=teuthology_branch)
-            ceph_branch = job_config['branch']
+            # For the teuthology tasks, we look for suite_branch, and if we
+            # don't get that, we look for branch, and fall back to 'master'.
+            # last-in-suite jobs don't have suite_branch or branch set.
+            ceph_branch = job_config.get('branch', 'master')
             suite_branch = job_config.get('suite_branch', ceph_branch)
             suite_path = fetch_qa_suite(suite_branch)
         except BranchNotFoundError: