From fe51db6fc0678e08755103ac4748d5857744bb07 Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Wed, 11 Sep 2013 15:14:58 -0500 Subject: [PATCH] Merge job_config and ctx.config --- teuthology/queue.py | 2 +- teuthology/run.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/teuthology/queue.py b/teuthology/queue.py index 692ce5cd37..22ec4577ba 100644 --- 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 68e40e33ae..36a48cb905 100644 --- 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 -- 2.39.5