From: John Spray <jspray@redhat.com>
Date: Tue, 16 Sep 2014 13:46:32 +0000 (+0100)
Subject: teuthology-suite: fix handling of extra YAML files
X-Git-Tag: 1.1.0~1166^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a227b5bafefd30e0170d98055e0eb017bd0737f2;p=teuthology.git

teuthology-suite: fix handling of extra YAML files

Previously these had to be absolute paths, or relative
paths had to be present in the pwd and in ceph-qa-suite.

With this change you can now pass a relative path
like 'debug/mds_client.yaml' to reference a debug
fragment from ceph-qa-suite.

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/teuthology/suite.py b/teuthology/suite.py
index 84d1f37555..3809e1376e 100644
--- a/teuthology/suite.py
+++ b/teuthology/suite.py
@@ -72,6 +72,10 @@ def main(args):
     if owner:
         job_config.owner = owner
 
+    # Interpret any relative paths as being relative to ceph-qa-suite (absolute
+    # paths are unchanged by this)
+    base_yaml_paths = [os.path.join(suite_repo_path, b) for b in base_yaml_paths]
+
     with NamedTemporaryFile(prefix='schedule_suite_',
                             delete=False) as base_yaml:
         base_yaml.write(str(job_config))