worker: Use suite_relpath if set

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

diff --git a/teuthology/worker.py b/teuthology/worker.py
index 6dd6590babac07f8bbccf7d6994bf1c6223c74bd..c82f70b6a499ef1a57ab3fcd18267495a70040d6 100644 (file)
--- a/teuthology/worker.py
+++ b/teuthology/worker.py
@@ -167,7 +167,10 @@ def prep_job(job_config, log_file_path, archive_dir):
         suite_repo = job_config.get('suite_repo')
         if suite_repo:
             teuth_config.ceph_qa_suite_git_url = suite_repo
-        job_config['suite_path'] = fetch_qa_suite(suite_branch)
+        job_config['suite_path'] = os.path.normpath(os.path.join(
+            fetch_qa_suite(suite_branch),
+            job_config.get('suite_relpath', ''),
+        ))
     except BranchNotFoundError as exc:
         log.exception("Branch not found; marking job as dead")
         report.try_push_job_info(