dovetail tool: change results dir into $DOVETAIL_HOME/results

JIRA: DOVETAIL-381

Now DoveTail's results dir is defined in $DOVETAIL_HOME/dovetail/conf/dovetail_config.yml,
and its default value is /home/opnfv/dovetail/results.

Since customer's jumphost may not have this dir and they don't want to create it,
Dovetail needs to change this dir into $DOVETAIL_HOME/results.

Change-Id: I616fb2da87bcfaabfd78d8762897e378168f694d
Signed-off-by: xudan <xudan16@huawei.com>

diff --git a/dovetail/conf/dovetail_config.yml b/dovetail/conf/dovetail_config.yml
index b8174bd..c7a69ef 100644 (file)
--- a/dovetail/conf/dovetail_config.yml
+++ b/dovetail/conf/dovetail_config.yml
@@ -1,5 +1,4 @@
 ---
-result_dir: /home/opnfv/dovetail/results
 report_file: 'dovetail_report.txt'
 cli_file_name: 'cmd_config.yml'
 report_dest: 'file'

diff --git a/dovetail/run.py b/dovetail/run.py
index 828a2b7..f6ce492 100755 (executable)
--- a/dovetail/run.py
+++ b/dovetail/run.py
@@ -153,10 +153,17 @@ def clean_results_dir():
             raise SystemExit(1)
 
 
+def get_result_path():
+    dovetail_home = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+    result_path = os.path.join(dovetail_home, 'results')
+    dt_cfg.dovetail_config['result_dir'] = result_path
+
+
 def main(*args, **kwargs):
     """Dovetail compliance test entry!"""
     build_tag = "daily-master-%s" % str(uuid.uuid4())
     dt_cfg.dovetail_config['build_tag'] = build_tag
+    get_result_path()
     clean_results_dir()
     if kwargs['debug']:
         os.environ['DEBUG'] = 'true'