From 59531d81c55b3ebe63f4798035bb785dd3a0242e Mon Sep 17 00:00:00 2001 From: Neha Ojha Date: Tue, 12 Sep 2017 08:26:27 -0700 Subject: [PATCH] qa: avoid using make install for fio Signed-off-by: Neha Ojha --- qa/suites/rados/perf/workloads/sample_fio.yaml | 1 - qa/tasks/cbt.py | 10 +++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/qa/suites/rados/perf/workloads/sample_fio.yaml b/qa/suites/rados/perf/workloads/sample_fio.yaml index 92a77034c89..d0fe0debde5 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 810299449ef..89a83a54c33 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' ] ) -- 2.39.5