From: Zack Cerza <zack@cerza.org>
Date: Wed, 26 Feb 2014 19:13:41 +0000 (-0600)
Subject: In find_job_info(), also look for orig.config.yaml
X-Git-Tag: 1.1.0~1638
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=34478127d2c59698ce5bc53ca762e809f49f7871;p=teuthology.git

In find_job_info(), also look for orig.config.yaml

Signed-off-by: Zack Cerza <zack.cerza@inktank.com>
---

diff --git a/teuthology/kill.py b/teuthology/kill.py
index 402643488f..698ef5614f 100755
--- a/teuthology/kill.py
+++ b/teuthology/kill.py
@@ -87,6 +87,11 @@ def find_job_info(job_archive_dir):
     conf_file = os.path.join(job_archive_dir, 'config.yaml')
     if os.path.isfile(conf_file):
         job_info.update(yaml.safe_load(open(conf_file, 'r')))
+    else:
+        conf_file = os.path.join(job_archive_dir, 'orig.config.yaml')
+        if os.path.isfile(conf_file):
+            log.debug("config.yaml not found but orig.config.yaml found")
+            job_info.update(yaml.safe_load(open(conf_file, 'r')))
 
     return job_info