From 5a72ace55ede5bb798435aaa249ebe12e501258e Mon Sep 17 00:00:00 2001 From: MatthewLi Date: Tue, 6 Jun 2017 23:46:21 -0400 Subject: https+credential support JIRA: DOVETAIL-440 Change-Id: I69fb96673755545e8e0d78d940870195dbf20a0b Signed-off-by: MatthewLi --- dovetail/run.py | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'dovetail/run.py') diff --git a/dovetail/run.py b/dovetail/run.py index 521379d7..986ee801 100755 --- a/dovetail/run.py +++ b/dovetail/run.py @@ -205,6 +205,16 @@ def copy_userconfig_files(logger): dt_utils.exec_cmd(cmd, logger, exit_on_error=False) +# env_init can source some env variable used in dovetail, such as +# when https+credential used, OS_CACERT +def env_init(logger): + openrc = os.path.join(dt_cfg.dovetail_config['config_dir'], + dt_cfg.dovetail_config['env_file']) + if not os.path.isfile(openrc): + logger.error("openrc file %s does not exist", openrc) + dt_utils.source_env(openrc) + + def main(*args, **kwargs): """Dovetail compliance test entry!""" build_tag = "daily-master-%s" % str(uuid.uuid4()) @@ -220,6 +230,7 @@ def main(*args, **kwargs): logger.info('Dovetail compliance: %s!', (kwargs['testsuite'])) logger.info('================================================') logger.info('Build tag: %s', dt_cfg.dovetail_config['build_tag']) + env_init(logger) copy_userconfig_files(logger) dt_utils.check_docker_version(logger) validate_input(kwargs, dt_cfg.dovetail_config['validate_input'], logger) -- cgit 1.2.3-korg