From: Zack Cerza <zack@cerza.org>
Date: Wed, 11 Sep 2013 20:40:14 +0000 (-0500)
Subject: Ensure teuthology_branch is stored in job_config
X-Git-Tag: 1.1.0~1883^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0ad9c8751eeca6ca15daf3796a3fb8218f00754d;p=teuthology.git

Ensure teuthology_branch is stored in job_config
---

diff --git a/teuthology/queue.py b/teuthology/queue.py
index 22ec4577b..cf277a923 100644
--- a/teuthology/queue.py
+++ b/teuthology/queue.py
@@ -164,8 +164,10 @@ describe. One job is run at a time.
         archive_path_full = os.path.join(ctx.archive_dir, safe_archive, str(job.jid))
         job_config['archive_path'] = archive_path_full
 
-        teuthology_branch = job_config.get(
-            'config', {}).get('teuthology_branch', 'master')
+        # If the teuthology branch was not specified, default to master and
+        # store that value.
+        teuthology_branch = job_config.get('teuthology_branch', 'master')
+        job_config['teuthology_branch'] = teuthology_branch
 
         teuth_path = os.path.join(os.getenv("HOME"),
                                   'teuthology-' + teuthology_branch)