diff options
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/config_functest.yaml | 1 | ||||
| -rw-r--r-- | ci/config_patch.yaml | 10 | ||||
| -rwxr-xr-x | ci/exec_test.sh | 7 | ||||
| -rwxr-xr-x | ci/prepare_env.py | 24 | ||||
| -rw-r--r-- | ci/testcases.yaml | 2 |
5 files changed, 39 insertions, 5 deletions
diff --git a/ci/config_functest.yaml b/ci/config_functest.yaml index 8e45b1d2..afa6ff1f 100644 --- a/ci/config_functest.yaml +++ b/ci/config_functest.yaml @@ -50,6 +50,7 @@ general: healthcheck: disk_image: /home/opnfv/functest/data/cirros-0.3.4-x86_64-disk.img + disk_format: qcow2 vping: ping_timeout: 200 diff --git a/ci/config_patch.yaml b/ci/config_patch.yaml new file mode 100644 index 00000000..4994d49d --- /dev/null +++ b/ci/config_patch.yaml @@ -0,0 +1,10 @@ +lxd: + general: + openstack: + image_name: Cirros-0.3.4 + image_file_name: cirros-0.3.4-x86_64-lxc.tar.gz + image_disk_format: raw + + healthcheck: + disk_image: /home/opnfv/functest/data/cirros-0.3.4-x86_64-lxc.tar.gz + disk_format: raw
\ No newline at end of file diff --git a/ci/exec_test.sh b/ci/exec_test.sh index ddbe486f..a0c41872 100755 --- a/ci/exec_test.sh +++ b/ci/exec_test.sh @@ -150,9 +150,10 @@ function run_test(){ ${repos_dir}/moon/tests/run_tests.sh ;; "multisite") - python ${FUNCTEST_REPO_DIR}/testcases/features/multisite.py + python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/tempest/gen_tempest_conf.py python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/tempest/run_tempest.py \ - $clean_flag -s -m feature_multisite $report + $clean_flag -s -m feature_multisite $report \ + -c ${FUNCTEST_REPO_DIR}/testcases/OpenStack/tempest/tempest_multisite.conf ;; "domino") python ${FUNCTEST_REPO_DIR}/testcases/features/domino.py @@ -172,7 +173,7 @@ function run_test(){ python ${FUNCTEST_REPO_DIR}/testcases/features/sfc/sfc.py ;; "parser") - python ${FUNCTEST_REPO_DIR}/testcases/vnf/RNC/parser.py + python ${FUNCTEST_REPO_DIR}/testcases/vnf/vRNC/parser.py $report ;; *) echo "The test case '${test_name}' does not exist." diff --git a/ci/prepare_env.py b/ci/prepare_env.py index e31afd49..116b1a6e 100755 --- a/ci/prepare_env.py +++ b/ci/prepare_env.py @@ -46,10 +46,16 @@ CI_SCENARIO = "" CI_DEBUG = False REPOS_DIR = os.getenv('repos_dir') FUNCTEST_REPO = REPOS_DIR + '/functest/' +CONFIG_FUNCTEST_PATH = os.environ["CONFIG_FUNCTEST_YAML"] +CONFIG_PATCH_PATH = os.path.join(os.path.dirname( + CONFIG_FUNCTEST_PATH), "config_patch.yaml") -with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f: +with open(CONFIG_FUNCTEST_PATH) as f: functest_yaml = yaml.safe_load(f) +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") @@ -183,6 +189,21 @@ def source_rc_file(): logger.debug("Used credentials: %s" % str) +def patch_config_file(): + updated = False + 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])) + updated = True + + if updated: + 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 verify_deployment(): print_separator() logger.info("Verifying OpenStack services...") @@ -262,6 +283,7 @@ def main(): check_env_variables() create_directories() source_rc_file() + patch_config_file() verify_deployment() install_rally() diff --git a/ci/testcases.yaml b/ci/testcases.yaml index 9109cd1d..ca0273c2 100644 --- a/ci/testcases.yaml +++ b/ci/testcases.yaml @@ -47,7 +47,7 @@ tiers: 2) Connectivity between 2 instances over a private network. dependencies: installer: '' - scenario: '' + scenario: '^((?!lxd).)*$' - name: tempest_smoke_serial |