diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2016-09-08 16:40:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-08 16:40:34 +0000 |
| commit | 9d19d1ff0bf7a5aada78bfc86cae831bcec86cc9 (patch) | |
| tree | 9f107cc19478ff179ec148e48e58fafde651f53b /ci | |
| parent | 4bd8e5f735562c38ad90c411f74f642c6e3ec73f (diff) | |
| parent | 55d301a2622ff5b63d431b9272caa68224d53843 (diff) | |
Merge "make use of functest_utils.get_parameter_from_yaml"
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/prepare_env.py | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/ci/prepare_env.py b/ci/prepare_env.py index 49b3ea75e..63a0ad4a8 100755 --- a/ci/prepare_env.py +++ b/ci/prepare_env.py @@ -48,21 +48,21 @@ CONFIG_FUNCTEST_PATH = os.environ["CONFIG_FUNCTEST_YAML"] CONFIG_PATCH_PATH = os.path.join(os.path.dirname( CONFIG_FUNCTEST_PATH), "config_patch.yaml") -functest_yaml = ft_utils.get_functest_yaml() - with open(CONFIG_PATCH_PATH) as f: functest_patch_yaml = yaml.safe_load(f) -FUNCTEST_CONF_DIR = functest_yaml.get("general").get( - "directories").get("dir_functest_conf") +FUNCTEST_CONF_DIR = \ + ft_utils.get_functest_config('general.directories.dir_functest_conf') + -FUNCTEST_DATA_DIR = functest_yaml.get("general").get( - "directories").get("dir_functest_data") -FUNCTEST_RESULTS_DIR = functest_yaml.get("general").get( - "directories").get("dir_results") -DEPLOYMENT_MAME = functest_yaml.get("rally").get("deployment_name") -TEMPEST_REPO_DIR = functest_yaml.get("general").get( - "directories").get("dir_repo_tempest") +FUNCTEST_DATA_DIR = \ + ft_utils.get_functest_config('general.directories.dir_functest_data') +FUNCTEST_RESULTS_DIR = \ + ft_utils.get_functest_config('general.directories.dir_results') +DEPLOYMENT_MAME = \ + ft_utils.get_functest_config('rally.deployment_name') +TEMPEST_REPO_DIR = \ + ft_utils.get_functest_config('general.directories.dir_repo_tempest') ENV_FILE = FUNCTEST_CONF_DIR + "/env_active" @@ -191,7 +191,7 @@ def patch_config_file(): for key in functest_patch_yaml: if key in CI_SCENARIO: new_functest_yaml = dict(ft_utils.merge_dicts( - functest_yaml, functest_patch_yaml[key])) + ft_utils.get_functest_yaml(), functest_patch_yaml[key])) updated = True if updated: |