summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--dovetail/conf/functest_config.yml4
-rw-r--r--dovetail/prepare_env.py6
2 files changed, 4 insertions, 6 deletions
diff --git a/dovetail/conf/functest_config.yml b/dovetail/conf/functest_config.yml
index ef2b7fb8..d32fe87f 100644
--- a/dovetail/conf/functest_config.yml
+++ b/dovetail/conf/functest_config.yml
@@ -10,8 +10,8 @@ functest:
- 'echo test for precondition'
testcase:
cmds:
- - 'python /home/opnfv/repos/functest/ci/prepare_env.py start'
- - 'python /home/opnfv/repos/functest/ci/run_tests.py -t {{script_testcase}} -r'
+ - 'functest env prepare'
+ - 'functest testcase run {{script_testcase}}'
post_condition:
cmds:
- ''
diff --git a/dovetail/prepare_env.py b/dovetail/prepare_env.py
index 9cf0f4f0..3ddf75bc 100644
--- a/dovetail/prepare_env.py
+++ b/dovetail/prepare_env.py
@@ -9,7 +9,6 @@
import platform
-import utils.dovetail_logger as dt_logger
import utils.dovetail_utils as dt_utils
@@ -52,15 +51,14 @@ def get_docker_pkgname(os):
def main():
"""Dovetail prepare env main"""
- logger = dt_logger.Logger('prepare_env.py').getLogger()
os_name = get_os_lower()
cmd = "sudo %s -y install %s python-pip" \
% (get_install_bin(os_name), get_docker_pkgname(os_name))
- dt_utils.exec_cmd(cmd, logger)
+ dt_utils.exec_cmd(cmd)
cmd = "sudo pip install click pyyaml jinja2"
- dt_utils.exec_cmd(cmd, logger)
+ dt_utils.exec_cmd(cmd)
if __name__ == '__main__':