diff options
Diffstat (limited to 'dovetail')
| -rw-r--r-- | dovetail/prepare_env.py | 7 | ||||
| -rw-r--r-- | dovetail/utils/dovetail_logger.py | 19 |
2 files changed, 20 insertions, 6 deletions
diff --git a/dovetail/prepare_env.py b/dovetail/prepare_env.py index 3e4d6964..7573fb6e 100644 --- a/dovetail/prepare_env.py +++ b/dovetail/prepare_env.py @@ -12,12 +12,13 @@ import utils.dovetail_logger as dt_logger import utils.dovetail_utils as dt_utils -def get_os(): +def get_os_lower(): """Get distro name. :returns: return distro name as a string """ - return platform.dist()[0] + platform_os = platform.dist()[0] + return platform_os.lower() def get_install_bin(os): @@ -49,7 +50,7 @@ def get_docker_pkgname(os): logger = dt_logger.Logger('prepare_env.py').getLogger() -os_name = get_os() +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) diff --git a/dovetail/utils/dovetail_logger.py b/dovetail/utils/dovetail_logger.py index bd13508d..9cd8719b 100644 --- a/dovetail/utils/dovetail_logger.py +++ b/dovetail/utils/dovetail_logger.py @@ -24,6 +24,18 @@ import logging import os +from conf.dovetail_config import dovetail_config +import dovetail_utils as dt_utils + + +def clean_results_dir(): + result_path = dovetail_config['result_dir'] + if os.path.exists(result_path): + cmd = 'sudo rm -rf %s' % (result_path) + dt_utils.exec_cmd(cmd) + +clean_results_dir() + class Logger: def __init__(self, logger_name): @@ -44,9 +56,10 @@ class Logger: ch.setLevel(logging.INFO) self.logger.addHandler(ch) - if not os.path.exists('/home/opnfv/dovetail/results/'): - os.makedirs('/home/opnfv/dovetail/results/') - hdlr = logging.FileHandler('/home/opnfv/dovetail/results/dovetail.log') + result_path = dovetail_config['result_dir'] + if not os.path.exists(result_path): + os.makedirs(result_path) + hdlr = logging.FileHandler(os.path.join(result_path, 'dovetail.log')) hdlr.setFormatter(formatter) hdlr.setLevel(logging.DEBUG) self.logger.addHandler(hdlr) |