Merge job_config and ctx.config

diff --git a/teuthology/queue.py b/teuthology/queue.py
index 692ce5cd3762b743df3c42d5ad40f62ce708d8a7..22ec4577ba6e9e0e25966b6b628fa3f118ac7e8a 100644 (file)
--- a/teuthology/queue.py
+++ b/teuthology/queue.py
@@ -220,7 +220,7 @@ def run_job(job_config, teuth_bin_path):
 
     with tempfile.NamedTemporaryFile(prefix='teuthology-worker.',
                                      suffix='.tmp',) as tmp:
-        yaml.safe_dump(data=job_config['config'], stream=tmp)
+        yaml.safe_dump(data=job_config, stream=tmp)
         tmp.flush()
         arg.append(tmp.name)
         p = subprocess.Popen(

diff --git a/teuthology/run.py b/teuthology/run.py
index 68e40e33aeea089a38ce61b304bd38f3c927d8b3..36a48cb9056825483701f3f906d3219ccc5b790f 100644 (file)
--- a/teuthology/run.py
+++ b/teuthology/run.py
@@ -364,7 +364,6 @@ def schedule():
         del ctx.config['targets']
 
     job_config = dict(
-            config=ctx.config,
             name=ctx.name,
             last_in_suite=ctx.last_in_suite,
             email=ctx.email,
@@ -372,6 +371,8 @@ def schedule():
             owner=ctx.owner,
             verbose=ctx.verbose,
             )
+    # Merge job_config and ctx.config
+    job_config.update(ctx.config)
     if ctx.timeout is not None:
         job_config['results_timeout'] = ctx.timeout