diff options
author | xudan <xudan16@huawei.com> | 2017-03-17 09:23:45 +0000 |
---|---|---|
committer | xudan <xudan16@huawei.com> | 2017-03-21 01:34:24 +0000 |
commit | f7d0d72958b41ea6685457abea6dc4d83f4370c3 (patch) | |
tree | ff367071b3f2223724ccbc6e34a4174c9a7d233c /dovetail/run.py | |
parent | 3cf37c9ac7b40a388f81fed13cfb0ad606dcd9a1 (diff) |
dovetail tool: remove installer and CI related variables
JIRA: DOVETAIL-371
1. remove all the envs in functest_config.yml and yardstick_config.yml
2. remove all relative cmds in cmd_config.yml
3. remove all the envs when running a new functest/yardstick container
4. add some variables just for functest pushing results to db
5. get the external network name for yardstick
6. make --debug/-d just control the log level shown on the screen
7. set requests=2.10.0 since python-openstackclient needs
'requests!=2.12.2,!=2.13.0,>=2.10.0'
Change-Id: I9f941e09d067fc95a14c3c9be1374f41df4a9a16
Signed-off-by: xudan <xudan16@huawei.com>
Diffstat (limited to 'dovetail/run.py')
-rwxr-xr-x | dovetail/run.py | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/dovetail/run.py b/dovetail/run.py index 1fb0a89a..05f48501 100755 --- a/dovetail/run.py +++ b/dovetail/run.py @@ -82,13 +82,6 @@ def validate_input(input_dict, check_dict, logger): logger.error("yard_tag can't be %s, valid in %s", yard_tag, valid_tag) raise SystemExit(1) - # for 'SUT_TYPE' option - sut_type = input_dict['sut_type'] - valid_type = check_dict['valid_sut_type'] - if sut_type is not None and sut_type not in valid_type: - logger.error("SUT_TYPE can't be %s, valid in %s", sut_type, valid_type) - raise SystemExit(1) - def filter_config(input_dict, logger): cli_dict = dt_cfg.dovetail_config['cli'] @@ -151,7 +144,7 @@ def main(*args, **kwargs): """Dovetail compliance test entry!""" clean_results_dir() if kwargs['debug']: - os.environ['DEBUG'] = kwargs['debug'] + os.environ['DEBUG'] = 'true' create_logs() logger = dt_logger.Logger('run').getLogger() logger.info('================================================') @@ -162,10 +155,6 @@ def main(*args, **kwargs): if configs is not None: dt_cfg.update_config(configs) - logger.info('Your new envs for functest: %s', - dt_cfg.dovetail_config['functest']['envs']) - logger.info('Your new envs for yardstick: %s', - dt_cfg.dovetail_config['yardstick']['envs']) testarea = kwargs['testarea'] testsuite_validation = False |