]> git-server-git.apps.pok.os.sepia.ceph.com Git - teuthology.git/commitdiff
Ensure teuthology_branch is stored in job_config
authorZack Cerza <zack@cerza.org>
Wed, 11 Sep 2013 20:40:14 +0000 (15:40 -0500)
committerZack Cerza <zack@cerza.org>
Wed, 11 Sep 2013 20:40:14 +0000 (15:40 -0500)
teuthology/queue.py

index 22ec4577ba6e9e0e25966b6b628fa3f118ac7e8a..cf277a9233c4036ee8e208b62c4d1692cdbc52e3 100644 (file)
@@ -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)