aboutsummaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorSerenaFeng <feng.xiaowei@zte.com.cn>2016-08-31 10:22:33 +0800
committerSerenaFeng <feng.xiaowei@zte.com.cn>2016-08-31 23:20:19 +0800
commitf4d0a05011e961a363c6d99522684ecdeb959716 (patch)
tree4fe3d75e31cb3f9e56bffe37cb98e79ea9851c87 /ci
parentfe5d0f8628b8e0defdfc6e3b0e4556b46311a2f9 (diff)
unify functest_yaml obtain process
functest_yaml is needed in almost all of the testcases, the obtain process is the same: with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f: functest_yaml = yaml.safe_load(f) f.close() abstract a method to unify the process, and provide the interface JIRA: FUNCTEST-447 Change-Id: I96a9a9962d7b466f10bbd3b5ab2495957524e22a Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
Diffstat (limited to 'ci')
-rwxr-xr-xci/prepare_env.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/ci/prepare_env.py b/ci/prepare_env.py
index 116b1a6e..b8c536f1 100755
--- a/ci/prepare_env.py
+++ b/ci/prepare_env.py
@@ -50,8 +50,7 @@ CONFIG_FUNCTEST_PATH = os.environ["CONFIG_FUNCTEST_YAML"]
CONFIG_PATCH_PATH = os.path.join(os.path.dirname(
CONFIG_FUNCTEST_PATH), "config_patch.yaml")
-with open(CONFIG_FUNCTEST_PATH) as f:
- functest_yaml = yaml.safe_load(f)
+functest_yaml = ft_utils.get_functest_yaml()
with open(CONFIG_PATCH_PATH) as f:
functest_patch_yaml = yaml.safe_load(f)