From: Sandon Van Ness <sandon@inktank.com>
Date: Sat, 14 Dec 2013 15:14:51 +0000 (-0800)
Subject: Use path when calling teuthology-report. …
X-Git-Tag: 1.1.0~1735
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=e4b5ab811e954a5b134d413aeb338805b5e3441d;p=teuthology.git

Use path when calling teuthology-report. …

The 'teuthology-report' command is probably not going to exist
in $PATH so get the location of the running command and assume its
in the same path.

Signed-off-by: Sandon Van Ness <sandon@inktank.com>
---

diff --git a/teuthology/queue.py b/teuthology/queue.py
index d95ea15242..dfbb66db0e 100644
--- a/teuthology/queue.py
+++ b/teuthology/queue.py
@@ -201,7 +201,7 @@ def worker(ctx):
         job.delete()
 
 
-def run_with_watchdog(process, job_config):
+def run_with_watchdog(process, job_config, teuth_bin_path):
     # Only push the information that's relevant to the watchdog, to save db
     # load
     job_info = dict(
@@ -219,7 +219,7 @@ def run_with_watchdog(process, job_config):
         # The job ran with a teuthology branch that may not have the reporting
         # feature. Let's call teuthology-report (which will be from the master
         # branch) to report the job manually.
-        args = ['teuthology-report',
+        args = [os.path.join(teuth_bin_path, 'teuthology-report'),
                 '-r',
                 job_info['name'],
                 '-j',
@@ -273,7 +273,7 @@ def run_job(job_config, teuth_bin_path):
 
         if teuth_config.results_server:
             log.info("Running with watchdog")
-            run_with_watchdog(p, job_config)
+            run_with_watchdog(p, job_config, teuth_bin_path)
         else:
             log.info("Running without watchdog")
             p.wait()