diff options
| author |   hongbo tian <hongbo.tianhongbo@huawei.com> | 2016-11-29 02:22:49 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-11-29 02:22:49 +0000 |
| commit | b9929410665d9809669b307b04904312d785be5a (patch) | |
| tree | 2e5e87129143ce7205fcf407269bad075468127e | |
| parent | 75dd45462f46c711f950c96aac783932cb7ec1a4 (diff) | |
| parent | 3cff5221e332c83d143a7150217513ca7f3e1ed1 (diff) | |
Merge "dovetail tool: change CI_DEBUG to DEBUG"
| -rw-r--r-- | dovetail/conf/cmd_config.yml | 6 | ||||
| -rw-r--r-- | dovetail/conf/dovetail_config.py | 2 | ||||
| -rw-r--r-- | dovetail/utils/dovetail_logger.py | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/dovetail/conf/cmd_config.yml b/dovetail/conf/cmd_config.yml index 04001774..4e3d0110 100644 --- a/dovetail/conf/cmd_config.yml +++ b/dovetail/conf/cmd_config.yml @@ -31,11 +31,11 @@ cli: - '--DEPLOY_TYPE' - '-T' help: 'DEPLOY_TYPE of the system under test (SUT).' - CI_DEBUG: + DEBUG: flags: - - '--CI_DEBUG' + - '--DEBUG' - '-d' - help: 'CI_DEBUG for showing debug log.' + help: 'DEBUG for showing debug log.' non-envs: testsuite: flags: diff --git a/dovetail/conf/dovetail_config.py b/dovetail/conf/dovetail_config.py index 5fe1e7b5..8fa1a6d2 100644 --- a/dovetail/conf/dovetail_config.py +++ b/dovetail/conf/dovetail_config.py @@ -55,6 +55,8 @@ class DovetailConfig: @classmethod def update_config_envs(cls, script_type, key): + if key == 'DEBUG': + os.environ['CI_DEBUG'] = os.environ[key] envs = cls.dovetail_config[script_type]['envs'] old_value = re.findall(r'\s+%s=(.*?)(\s+|$)' % key, envs) if old_value == []: diff --git a/dovetail/utils/dovetail_logger.py b/dovetail/utils/dovetail_logger.py index 6a2d38d5..e725e612 100644 --- a/dovetail/utils/dovetail_logger.py +++ b/dovetail/utils/dovetail_logger.py @@ -40,7 +40,7 @@ clean_results_dir() class Logger: def __init__(self, logger_name): - CI_DEBUG = os.getenv('CI_DEBUG') + DEBUG = os.getenv('DEBUG') self.logger = logging.getLogger(logger_name) self.logger.propagate = 0 @@ -50,7 +50,7 @@ class Logger: formatter = logging.Formatter('%(asctime)s - %(name)s - ' '%(levelname)s - %(message)s') ch.setFormatter(formatter) - if CI_DEBUG is not None and CI_DEBUG.lower() == "true": + if DEBUG is not None and DEBUG.lower() == "true": ch.setLevel(logging.DEBUG) else: ch.setLevel(logging.INFO) |