]> git.apps.os.sepia.ceph.com Git - teuthology.git/commitdiff
Revert "Use path when calling teuthology-report. …"
authorZack Cerza <zack@cerza.org>
Mon, 16 Dec 2013 17:43:06 +0000 (11:43 -0600)
committerZack Cerza <zack@cerza.org>
Mon, 16 Dec 2013 17:43:06 +0000 (11:43 -0600)
This reverts commit e4b5ab811e954a5b134d413aeb338805b5e3441d.

teuthology/queue.py

index dfbb66db0e7487d60646caa18daf8e608f66af3c..d95ea15242fd8f1a60f769945b971852e64ca982 100644 (file)
@@ -201,7 +201,7 @@ def worker(ctx):
         job.delete()
 
 
-def run_with_watchdog(process, job_config, teuth_bin_path):
+def run_with_watchdog(process, job_config):
     # 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, teuth_bin_path):
         # 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 = [os.path.join(teuth_bin_path, 'teuthology-report'),
+        args = ['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, teuth_bin_path)
+            run_with_watchdog(p, job_config)
         else:
             log.info("Running without watchdog")
             p.wait()