diff options
Diffstat (limited to 'functest/ci')
| -rw-r--r-- | functest/ci/config_aarch64_patch.yaml | 3 | ||||
| -rw-r--r-- | functest/ci/config_functest.yaml | 4 | ||||
| -rw-r--r-- | functest/ci/config_patch.yaml | 3 | ||||
| -rwxr-xr-x | functest/ci/prepare_env.py | 17 |
4 files changed, 19 insertions, 8 deletions
diff --git a/functest/ci/config_aarch64_patch.yaml b/functest/ci/config_aarch64_patch.yaml index cd395ab8..80cf4ccc 100644 --- a/functest/ci/config_aarch64_patch.yaml +++ b/functest/ci/config_aarch64_patch.yaml @@ -16,6 +16,9 @@ os: vping: image_name: TestVM + tempest: + use_custom_images: False + odl_sfc: image_base_url: "http://artifacts.opnfv.org/sfc/demo" image_name: sfc_nsh_danube diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml index 9b796071..1b2c8380 100644 --- a/functest/ci/config_functest.yaml +++ b/functest/ci/config_functest.yaml @@ -130,7 +130,7 @@ tempest: tenant_name: tempest tenant_description: Tenant for Tempest test suite user_name: tempest - user_password: tempest + user_password: Tempest123! validation: ssh_timeout: 130 object_storage: @@ -139,7 +139,7 @@ tempest: private_subnet_name: tempest-subnet private_subnet_cidr: 192.168.150.0/24 router_name: tempest-router - use_custom_images: False + use_custom_images: True use_custom_flavors: False volume_device_name: vdc diff --git a/functest/ci/config_patch.yaml b/functest/ci/config_patch.yaml index d47766b6..ad8b0889 100644 --- a/functest/ci/config_patch.yaml +++ b/functest/ci/config_patch.yaml @@ -13,16 +13,13 @@ fdio: flavor_extra_specs: {'hw:mem_page_size':'large'} image_properties: {'hw_mem_page_size':'large'} tempest: - use_custom_images: True use_custom_flavors: True ovs: general: flavor_extra_specs: {'hw:mem_page_size':'large'} image_properties: {'hw_mem_page_size':'large'} tempest: - use_custom_images: True use_custom_flavors: True multisite: tempest: - use_custom_images: True use_custom_flavors: True diff --git a/functest/ci/prepare_env.py b/functest/ci/prepare_env.py index 19e37862..9e53e30b 100755 --- a/functest/ci/prepare_env.py +++ b/functest/ci/prepare_env.py @@ -210,12 +210,15 @@ def source_rc_file(): CONST.__setattr__('OS_PASSWORD', value) -def patch_config_file(): +def update_config_file(): patch_file(CONFIG_PATCH_PATH) if pod_arch and pod_arch in arch_filter: patch_file(CONFIG_AARCH64_PATCH_PATH) + if "TEST_DB_URL" in os.environ: + update_db_url() + def patch_file(patch_file_path): logger.debug('Updating file: %s', patch_file_path) @@ -233,7 +236,15 @@ def patch_file(patch_file_path): os.remove(CONFIG_FUNCTEST_PATH) with open(CONFIG_FUNCTEST_PATH, "w") as f: f.write(yaml.dump(new_functest_yaml, default_style='"')) - f.close() + + +def update_db_url(): + with open(CONFIG_FUNCTEST_PATH) as f: + functest_yaml = yaml.safe_load(f) + + with open(CONFIG_FUNCTEST_PATH, "w") as f: + functest_yaml["results"]["test_db_url"] = os.environ.get('TEST_DB_URL') + f.write(yaml.dump(functest_yaml, default_style='"')) def verify_deployment(): @@ -357,7 +368,7 @@ def main(**kwargs): get_deployment_handler() create_directories() source_rc_file() - patch_config_file() + update_config_file() verify_deployment() install_rally() install_tempest() |