From: Zack Cerza <zack@redhat.com>
Date: Wed, 30 Nov 2016 21:22:10 +0000 (-0700)
Subject: run: Use suite_relpath if set
X-Git-Tag: 1.1.0~487^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f1962e55e5bed25af381ef4fee7acde5a824bd63;p=teuthology.git

run: Use suite_relpath if set

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

diff --git a/teuthology/run.py b/teuthology/run.py
index 756fc25c8..2b469227e 100644
--- a/teuthology/run.py
+++ b/teuthology/run.py
@@ -94,8 +94,14 @@ def fetch_tasks_if_needed(job_config):
         log.info("Tasks not found; will attempt to fetch")
 
     ceph_branch = job_config.get('branch', 'master')
+    suite_repo = job_config.get('suite_repo')
+    if suite_repo:
+        teuth_config.ceph_qa_suite_git_url = suite_repo
     suite_branch = job_config.get('suite_branch', ceph_branch)
-    suite_path = fetch_qa_suite(suite_branch)
+    suite_path = os.path.normpath(os.path.join(
+        fetch_qa_suite(suite_branch),
+        job_config.get('suite_relpath', ''),
+    ))
     sys.path.insert(1, suite_path)
     return suite_path