From: Neha Ojha <nojha@redhat.com>
Date: Tue, 12 Sep 2017 15:26:27 +0000 (-0700)
Subject: qa: avoid using make install for fio
X-Git-Tag: v13.0.1~917^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F17583%2Fhead;p=ceph.git

qa: avoid using make install for fio

Signed-off-by: Neha Ojha <nojha@redhat.com>
---

diff --git a/qa/suites/rados/perf/workloads/sample_fio.yaml b/qa/suites/rados/perf/workloads/sample_fio.yaml
index 92a77034c899..d0fe0debde5a 100644
--- a/qa/suites/rados/perf/workloads/sample_fio.yaml
+++ b/qa/suites/rados/perf/workloads/sample_fio.yaml
@@ -13,7 +13,6 @@ tasks:
         osd_ra: [4096]
         pool_profile: 'rbd'
         log_avg_msec: 100
-        cmd_path: '/usr/local/bin/fio'
     cluster:
       user: 'ubuntu'
       osds_per_node: 3
diff --git a/qa/tasks/cbt.py b/qa/tasks/cbt.py
index 810299449ef2..89a83a54c33a 100644
--- a/qa/tasks/cbt.py
+++ b/qa/tasks/cbt.py
@@ -38,9 +38,14 @@ class CBT(Task):
             tmp_dir='/tmp/cbt',
             pool_profiles=self.config.get('cluster', {}).get('pool_profiles'),
             )
+        benchmark_config = self.config.get('benchmarks')
+        benchmark_type = benchmark_config.keys()[0]
+        if benchmark_type == 'librbdfio':
+          testdir = misc.get_testdir(self.ctx)
+          benchmark_config['librbdfio']['cmd_path'] = os.path.join(testdir, 'fio/fio')
         return dict(
             cluster=cluster_config,
-            benchmarks=self.config.get('benchmarks'),
+            benchmarks=benchmark_config,
             )
 
     def install_dependencies(self):
@@ -67,8 +72,7 @@ class CBT(Task):
             args=[
                 'cd', os.path.join(testdir, 'fio'), run.Raw('&&'),
                 './configure', run.Raw('&&'),
-                'make', run.Raw('&&'),
-                'sudo', 'make', 'install'
+                'make'
             ]
         )