From: Zack Cerza <zack.cerza@inktank.com>
Date: Tue, 19 Aug 2014 17:54:13 +0000 (-0600)
Subject: Use suite_path, if set, for one-off jobs as well
X-Git-Tag: 1.1.0~1254
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0526c6bc6b80e76e8db1a342aa6ba1b6b3ec96ea;p=teuthology.git

Use suite_path, if set, for one-off jobs as well

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

diff --git a/teuthology/run.py b/teuthology/run.py
index 59e4d7f46..96cca618c 100644
--- a/teuthology/run.py
+++ b/teuthology/run.py
@@ -76,15 +76,16 @@ def fetch_tasks_if_needed(job_config):
     # in its config.
     suite_path = job_config.get('suite_path')
     if suite_path:
-        log.info("suite_path is set to %s; not fetching tasks", suite_path)
-        return
+        log.info("suite_path is set to %s; will attempt to use it", suite_path)
+        if suite_path not in sys.path:
+            sys.path.insert(1, suite_path)
 
     try:
         import tasks
         log.info("Found tasks at %s", os.path.dirname(tasks.__file__))
         return
     except ImportError:
-        pass
+        log.info("Tasks not found; will attempt to fetch")
 
     ceph_branch = job_config.get('branch', 'master')
     suite_branch = job_config.get('suite_branch', ceph_branch)