Add job id and actual archive dir to job config

Also add job id to info.yaml

diff --git a/teuthology/queue.py b/teuthology/queue.py
index ef3e72c31c35683ecc297147a384a4bf58128f12..692ce5cd3762b743df3c42d5ad40f62ce708d8a7 100644 (file)
--- a/teuthology/queue.py
+++ b/teuthology/queue.py
@@ -158,7 +158,12 @@ describe. One job is run at a time.
         log.debug('Reserved job %d', job.jid)
         log.debug('Config is: %s', job.body)
         job_config = yaml.safe_load(job.body)
+
+        job_config['job_id'] = job.jid
         safe_archive = safepath.munge(job_config['name'])
+        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')
 
@@ -189,13 +194,12 @@ describe. One job is run at a time.
         else:
             log.debug('Creating archive dir...')
             safepath.makedirs(ctx.archive_dir, safe_archive)
-            archive_path = os.path.join(ctx.archive_dir, safe_archive, str(job.jid))
             log.info('Running job %d', job.jid)
-            run_job(job_config, archive_path, teuth_bin_path)
+            run_job(job_config, teuth_bin_path)
         job.delete()
 
 
-def run_job(job_config, archive_path, teuth_bin_path):
+def run_job(job_config, teuth_bin_path):
     arg = [
         os.path.join(teuth_bin_path, 'teuthology'),
     ]
@@ -207,7 +211,7 @@ def run_job(job_config, archive_path, teuth_bin_path):
         '--lock',
         '--block',
         '--owner', job_config['owner'],
-        '--archive', archive_path,
+        '--archive', job_config['archive_path'],
         '--name', job_config['name'],
     ])
     if job_config['description'] is not None:

diff --git a/teuthology/run.py b/teuthology/run.py
index 7cbd81bf9e34e098fda879cfc34044092816de06..08e34ace7af74502ec98a6c8eafb59996e555ac3 100644 (file)
--- a/teuthology/run.py
+++ b/teuthology/run.py
@@ -139,6 +139,7 @@ def write_initial_metadata(ctx):
             'description': ctx.description,
             'owner': ctx.owner,
             'pid': os.getpid(),
+            'job_id': ctx.config['job_id'],
         }
         with file(os.path.join(ctx.archive, 'info.yaml'), 'w') as f:
             yaml.safe_dump(info, f, default_flow_style=False)