summaryrefslogtreecommitdiffstats
path: root/dovetail/conf
diff options
context:
space:
mode:
authorMatthewLi <matthew.lijun@huawei.com>2016-10-12 23:51:50 -0400
committerMatthewLi <matthew.lijun@huawei.com>2016-10-13 23:14:35 -0400
commit2c7f65363fc429fbf58bacfae9edbf8e601d01c7 (patch)
treebefbfa46d1111a005d997596d0e411c4581b42a4 /dovetail/conf
parent690d329a91af99777a0d48cdd2ea84ac7e803c0e (diff)
dovetail tool: setup.py added and path error amend
JIRA: DOVETAIL-26 1)ez_setup.py setup.py is added 2)flake8 is there, then format check can be easily achived in CI later 3)path error amend see details in DOVETAIL-33 Change-Id: Ic19dbac852694adaeecf5cdf6c2ae7c9ea9dbb33 Signed-off-by: MatthewLi <matthew.lijun@huawei.com>
Diffstat (limited to 'dovetail/conf')
-rw-r--r--dovetail/conf/dovetail_config.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/dovetail/conf/dovetail_config.py b/dovetail/conf/dovetail_config.py
index e7942f52..f822d3ad 100644
--- a/dovetail/conf/dovetail_config.py
+++ b/dovetail/conf/dovetail_config.py
@@ -14,11 +14,12 @@ SCENARIO_NAMING_FMT = 'certification_%s'
import yaml
import os
-with open(os.path.join(os.getcwd(),'conf','dovetail_config.yml')) as f:
+curr_path = os.path.dirname(os.path.abspath(__file__))
+with open(os.path.join(curr_path, 'dovetail_config.yml')) as f:
dovetail_config = yaml.safe_load(f)
for extra_config_file in dovetail_config['include_config']:
- with open(os.path.join(os.getcwd(),'conf',extra_config_file)) as f:
+ with open(os.path.join(curr_path, extra_config_file)) as f:
extra_config = yaml.safe_load(f)
dovetail_config.update(extra_config)