dispatcher: do not put targets in orig config

There is introduced targets in orig.config.yaml in the dispatcher code,
however it should not be here so the original config should be still
usable with teuthology (teuthology-run) with arbitrary targets yaml
file, which is provided separately.

Signed-off-by: Kyrylo Shatskyy <kyrylo.shatskyy@clyso.com>

Author: kshtsk

teuthology/dispatcher/__init__.py

@@ -145,9 +145,16 @@ def main(args):
         except SkipJob:
             continue
 
-        # lock machines but do not reimage them
-        if 'roles' in job_config:
-            job_config = lock_machines(job_config)
+        # Create run archive directory if not already created and
+        # job's archive directory
+        job_archive_path = job_config['archive_path']
+        log.info('Creating job\'s archive dir %s', job_archive_path)
+        safepath.makedirs('/', job_archive_path)
+
+        orig_job_config_path = os.path.join(job_archive_path, 'orig.config.yaml')
+        # Write initial job config in job archive dir
+        with open(orig_job_config_path, 'w') as f:
+            yaml.safe_dump(job_config, f, default_flow_style=False)
 
         run_args = [
             os.path.join(teuth_bin_path, 'teuthology-supervisor'),
@@ -156,19 +163,21 @@ def main(args):
             '--archive-dir', archive_dir,
         ]
 
-        # Create run archive directory if not already created and
-        # job's archive directory
-        create_job_archive(job_config['name'],
-                           job_config['archive_path'],
-                           archive_dir)
-        job_config_path = os.path.join(job_config['archive_path'], 'orig.config.yaml')
+        targets_job_config = None
+        # lock machines but do not reimage them
+        if 'roles' in job_config:
+            targets_job_config = lock_machines(job_config)
 
-        # Write initial job config in job archive dir
-        with open(job_config_path, 'w') as f:
-            yaml.safe_dump(job_config, f, default_flow_style=False)
+            job_config_path = os.path.join(job_archive_path, 'targets.config.yaml')
+
+            with open(job_config_path, 'w') as f:
+                yaml.safe_dump(targets_job_config, f, default_flow_style=False)
 
-        run_args.extend(["--job-config", job_config_path])
+            run_args.extend(["--job-config", job_config_path])
+        else:
+            run_args.extend(["--job-config", orig_job_config_path])
 
+        report.try_push_job_info(job_config, dict(status='running'))
         try:
             job_proc = subprocess.Popen(
                 run_args,
@@ -180,8 +189,8 @@ def main(args):
         except Exception:
             error_message = "Saw error while trying to spawn supervisor."
             log.exception(error_message)
-            if 'targets' in job_config:
-                node_names = job_config["targets"].keys()
+            if targets_job_config and 'targets' in targets_job_config:
+                node_names = targets_job_config["targets"].keys()
                 lock_ops.unlock_safe(
                     node_names,
                     job_config["owner"],
@@ -337,7 +346,6 @@ def check_job_expiration(job_config):
 
 
 def lock_machines(job_config):
-    report.try_push_job_info(job_config, dict(status='running'))
     fake_ctx = supervisor.create_fake_context(job_config, block=True)
     machine_type = job_config["machine_type"]
     count = len(job_config['roles'])
@@ -352,14 +360,5 @@ def lock_machines(job_config):
             tries=-1,
             reimage=False,
         )
-    job_config = fake_ctx.config
-    return job_config
-
+    return fake_ctx.config
 
-def create_job_archive(job_name, job_archive_path, archive_dir):
-    log.info('Creating job\'s archive dir %s', job_archive_path)
-    safe_archive = safepath.munge(job_name)
-    run_archive = os.path.join(archive_dir, safe_archive)
-    if not os.path.exists(run_archive):
-        safepath.makedirs('/', run_archive)
-    safepath.makedirs('/', job_archive_path)