From: John Spray <john.spray@redhat.com>
Date: Wed, 21 Dec 2016 12:23:14 +0000 (+0000)
Subject: qa: fix vstart_runner tasks import
X-Git-Tag: v12.0.0~56^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=081038ef53cb8a98cdd49db133609c37792fd709;p=ceph.git

qa: fix vstart_runner tasks import

Instead of hunting around the filesystem for
ceph-qa-suite, get it from our own location.

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

diff --git a/qa/tasks/vstart_runner.py b/qa/tasks/vstart_runner.py
index 67da66a62d8..629c89162b9 100644
--- a/qa/tasks/vstart_runner.py
+++ b/qa/tasks/vstart_runner.py
@@ -86,12 +86,17 @@ if os.path.exists("./CMakeCache.txt") and os.path.exists("./bin"):
     # A list of candidate paths for each package we need
     guesses = [
         ["~/git/teuthology", "~/scm/teuthology", "~/teuthology"],
-        ["~/git/ceph-qa-suite", "~/scm/ceph-qa-suite", "~/ceph-qa-suite"],
         ["lib/cython_modules/lib.2"],
         ["../src/pybind"],
     ]
 
     python_paths = []
+
+    # Up one level so that "tasks.foo.bar" imports work
+    python_paths.append(os.path.abspath(
+        os.path.join(os.path.dirname(os.path.realpath(__file__)), "..")
+    ))
+
     for package_guesses in guesses:
         for g in package_guesses:
             g_exp = os.path.abspath(os.path.expanduser(g))