diff options
Diffstat (limited to 'dovetail/run.py')
| -rwxr-xr-x | dovetail/run.py | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/dovetail/run.py b/dovetail/run.py index 4778fa51..5ff22323 100755 --- a/dovetail/run.py +++ b/dovetail/run.py @@ -105,7 +105,7 @@ def validate_input(input_dict, check_dict, logger): # for 'func_tag' and 'yard_tag' options func_tag = input_dict['func_tag'] yard_tag = input_dict['yard_tag'] - bott_tag = input_dict['bott_tag'] + # bott_tag = input_dict['bott_tag'] valid_tag = check_dict['valid_docker_tag'] if func_tag is not None and func_tag not in valid_tag: logger.error("The input option 'func_tag' can't be {}, " @@ -115,10 +115,10 @@ def validate_input(input_dict, check_dict, logger): logger.error("The input option 'yard_tag' can't be {}, " "valid values are {}.".format(yard_tag, valid_tag)) raise SystemExit(1) - if bott_tag is not None and bott_tag not in valid_tag: - logger.error("The input option 'bott_tag' can't be {}, " - "valid values are {}.".format(bott_tag, valid_tag)) - raise SystemExit(1) + # if bott_tag is not None and bott_tag not in valid_tag: + # logger.error("The input option 'bott_tag' can't be {}, " + # "valid values are {}.".format(bott_tag, valid_tag)) + # raise SystemExit(1) # for 'report' option report = input_dict['report'] @@ -221,7 +221,7 @@ def copy_patch_files(logger): patch_set_path = dt_cfg.dovetail_config['patch_dir'] if not os.path.isdir(patch_set_path): os.makedirs(patch_set_path) - cmd = 'sudo cp -r %s/* %s' % (patch_path, patch_set_path) + cmd = 'sudo cp -a -r %s/* %s' % (patch_path, patch_set_path) dt_utils.exec_cmd(cmd, logger, exit_on_error=False) @@ -281,6 +281,12 @@ def main(*args, **kwargs): else: dt_cfg.dovetail_config['offline'] = False + if kwargs['no_api_validation']: + dt_cfg.dovetail_config['no_api_validation'] = True + logger.warning('Strict API response validation DISABLED.') + else: + dt_cfg.dovetail_config['no_api_validation'] = False + dt_utils.get_hardware_info(logger) origin_testarea = kwargs['testarea'] |