diff options
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/config_functest.yaml | 27 | ||||
| -rw-r--r-- | ci/config_patch.yaml | 6 | ||||
| -rwxr-xr-x | ci/exec_test.sh | 17 | ||||
| -rwxr-xr-x | ci/prepare_env.py | 37 | ||||
| -rwxr-xr-x | ci/run_tests.py | 4 | ||||
| -rw-r--r-- | ci/testcases.yaml | 2 |
6 files changed, 45 insertions, 48 deletions
diff --git a/ci/config_functest.yaml b/ci/config_functest.yaml index 2b3317a1b..12e78d6df 100644 --- a/ci/config_functest.yaml +++ b/ci/config_functest.yaml @@ -162,20 +162,19 @@ multisite: installer_password: 'root' multisite_controller_ip: '10.1.0.50' promise: - general: - tenant_name: promise - tenant_description: promise Functionality Testing - user_name: promiser - user_pwd: test - image_name: promise-img - flavor_name: promise-flavor - flavor_vcpus: 1 - flavor_ram: 128 - flavor_disk: 0 - network_name: promise-net - subnet_name: promise-subnet - subnet_cidr: 192.168.121.0/24 - router_name: promise-router + tenant_name: promise + tenant_description: promise Functionality Testing + user_name: promiser + user_pwd: test + image_name: promise-img + flavor_name: promise-flavor + flavor_vcpus: 1 + flavor_ram: 128 + flavor_disk: 0 + network_name: promise-net + subnet_name: promise-subnet + subnet_cidr: 192.168.121.0/24 + router_name: promise-router example: example_vm_name: example-vm diff --git a/ci/config_patch.yaml b/ci/config_patch.yaml index 4994d49d1..251ab1c4d 100644 --- a/ci/config_patch.yaml +++ b/ci/config_patch.yaml @@ -7,4 +7,8 @@ lxd: 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 + disk_format: raw +fdio: + general: + flavor_extra_specs: {'hw:mem_page_size':'large'} + image_properties: {'hw_mem_page_size':'large'}
\ No newline at end of file diff --git a/ci/exec_test.sh b/ci/exec_test.sh index deb505df9..e402e0c31 100755 --- a/ci/exec_test.sh +++ b/ci/exec_test.sh @@ -147,18 +147,11 @@ function run_test(){ python ${FUNCTEST_REPO_DIR}/testcases/features/domino.py $report ;; "odl-sfc") - bash ${FUNCTEST_REPO_DIR}/testcases/features/sfc/server_presetup_CI.bash - ret_val=$? - if [ $ret_val != 0 ]; then - exit $ret_val - fi - bash ${FUNCTEST_REPO_DIR}/testcases/features/sfc/compute_presetup_CI.bash - ret_val=$? - if [ $ret_val != 0 ]; then - exit $ret_val - fi - source ${FUNCTEST_REPO_DIR}/testcases/features/sfc/tackerc - python ${FUNCTEST_REPO_DIR}/testcases/features/sfc/sfc.py $report + ODL_SFC_DIR=${FUNCTEST_REPO_DIR}/testcases/features/sfc + # pass FUNCTEST_REPO_DIR inside prepare_odl_sfc.bash + FUNCTEST_REPO_DIR=${FUNCTEST_REPO_DIR} bash ${ODL_SFC_DIR}/prepare_odl_sfc.bash || exit $? + source ${ODL_SFC_DIR}/tackerc + python ${ODL_SFC_DIR}/sfc.py $report ;; "parser") python ${FUNCTEST_REPO_DIR}/testcases/vnf/vRNC/parser.py $report diff --git a/ci/prepare_env.py b/ci/prepare_env.py index 49dcdd505..6b1babaa8 100755 --- a/ci/prepare_env.py +++ b/ci/prepare_env.py @@ -20,11 +20,11 @@ import subprocess import sys import argparse +import yaml + import functest.utils.functest_logger as ft_logger import functest.utils.functest_utils as ft_utils import functest.utils.openstack_utils as os_utils -import yaml -from functest.utils.functest_utils import FUNCTEST_REPO as FUNCTEST_REPO actions = ['start', 'check'] parser = argparse.ArgumentParser() @@ -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" @@ -89,10 +89,11 @@ def check_env_variables(): logger.warning("The env variable 'INSTALLER_TYPE' is not defined.") CI_INSTALLER_TYPE = "undefined" else: - if os.getenv('INSTALLER_TYPE') not in INSTALLERS: + if CI_INSTALLER_TYPE not in INSTALLERS: logger.warning("INSTALLER_TYPE=%s is not a valid OPNFV installer. " - "Available OPNFV Installers are : %s." - "Setting INSTALLER_TYPE=undefined." % INSTALLERS) + "Available OPNFV Installers are : %s. " + "Setting INSTALLER_TYPE=undefined." + % (CI_INSTALLER_TYPE, INSTALLERS)) CI_INSTALLER_TYPE = "undefined" else: logger.info(" INSTALLER_TYPE=%s" % CI_INSTALLER_TYPE) @@ -191,7 +192,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: @@ -204,7 +205,7 @@ def patch_config_file(): def verify_deployment(): print_separator() logger.info("Verifying OpenStack services...") - cmd = ("%s/ci/check_os.sh" % FUNCTEST_REPO) + cmd = ("%s/ci/check_os.sh" % ft_utils.FUNCTEST_REPO) logger.debug("Executing command: %s" % cmd) p = subprocess.Popen(cmd, stdout=subprocess.PIPE, shell=True) diff --git a/ci/run_tests.py b/ci/run_tests.py index 194793838..af8f51dd0 100755 --- a/ci/run_tests.py +++ b/ci/run_tests.py @@ -14,6 +14,7 @@ import re import sys import argparse + import functest.ci.generate_report as generate_report import functest.ci.tier_builder as tb import functest.utils.functest_logger as ft_logger @@ -22,7 +23,6 @@ import functest.utils.openstack_clean as os_clean import functest.utils.openstack_snapshot as os_snapshot import functest.utils.openstack_utils as os_utils from functest.testcases.Controllers.ODL.OpenDaylightTesting import ODLTestCases -from functest.utils.functest_utils import FUNCTEST_REPO as FUNCTEST_REPO parser = argparse.ArgumentParser() parser.add_argument("-t", "--test", dest="test", action='store', @@ -41,7 +41,7 @@ logger = ft_logger.Logger("run_tests").getLogger() """ global variables """ -EXEC_SCRIPT = ("%s/ci/exec_test.sh" % FUNCTEST_REPO) +EXEC_SCRIPT = ("%s/ci/exec_test.sh" % ft_utils.FUNCTEST_REPO) CLEAN_FLAG = True REPORT_FLAG = False EXECUTED_TEST_CASES = [] diff --git a/ci/testcases.yaml b/ci/testcases.yaml index 4fcdd1b02..3b76e139d 100644 --- a/ci/testcases.yaml +++ b/ci/testcases.yaml @@ -71,7 +71,7 @@ tiers: Rally suite in smoke mode. dependencies: installer: '' - scenario: '' + scenario: '^((?!bgpvpn).)*$' - name: sdn_suites |