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 84d1f375554f9d73788a0917aec7ab321aa62298..3809e1376e79a52969bd760e82b0ad924a14ea0b 100644 (file)
--- 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))