aboutsummaryrefslogtreecommitdiffstats
path: root/functest/ci
diff options
context:
space:
mode:
Diffstat (limited to 'functest/ci')
-rw-r--r--functest/ci/check_deployment.py1
-rw-r--r--functest/ci/config_functest.yaml6
-rw-r--r--functest/ci/prepare_env.py9
-rw-r--r--functest/ci/run_tests.py1
4 files changed, 12 insertions, 5 deletions
diff --git a/functest/ci/check_deployment.py b/functest/ci/check_deployment.py
index fe20dc8f..13bb4c8b 100644
--- a/functest/ci/check_deployment.py
+++ b/functest/ci/check_deployment.py
@@ -159,5 +159,6 @@ def main():
"""Entry point"""
logging.config.fileConfig(pkg_resources.resource_filename(
'functest', 'ci/logging.ini'))
+ logging.captureWarnings(True)
deployment = CheckDeployment()
return deployment.check_all()
diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml
index ee22aa24..16ba8b82 100644
--- a/functest/ci/config_functest.yaml
+++ b/functest/ci/config_functest.yaml
@@ -110,6 +110,7 @@ odl_sfc:
image_format: qcow2
tempest:
+ unique_names: True
deployment_name: opnfv-tempest
identity:
tenant_name: tempest
@@ -145,6 +146,10 @@ vnf:
tenant_name: cloudify_ims
tenant_description: vIMS
config: cloudify_ims.yaml
+ cloudify_ims_perf:
+ tenant_name: cloudify_ims_perf
+ tenant_description: vIMS
+ config: cloudify_ims_perf.yaml
orchestra_openims:
tenant_name: orchestra_openims
tenant_description: OpenIMS deployed with Open Baton
@@ -193,4 +198,3 @@ energy_recorder:
api_url: http://energy.opnfv.fr/resources
api_user: ""
api_password: ""
-
diff --git a/functest/ci/prepare_env.py b/functest/ci/prepare_env.py
index a354dbe8..36d04296 100644
--- a/functest/ci/prepare_env.py
+++ b/functest/ci/prepare_env.py
@@ -37,14 +37,14 @@ pod_arch = os.getenv("POD_ARCH", None)
arch_filter = ['aarch64']
CONFIG_FUNCTEST_PATH = pkg_resources.resource_filename(
- 'functest', 'ci/config_functest.yaml')
+ 'functest', 'ci/config_functest.yaml')
CONFIG_PATCH_PATH = pkg_resources.resource_filename(
- 'functest', 'ci/config_patch.yaml')
+ 'functest', 'ci/config_patch.yaml')
CONFIG_AARCH64_PATCH_PATH = pkg_resources.resource_filename(
- 'functest', 'ci/config_aarch64_patch.yaml')
+ 'functest', 'ci/config_aarch64_patch.yaml')
RALLY_CONF_PATH = "/etc/rally/rally.conf"
RALLY_AARCH64_PATCH_PATH = pkg_resources.resource_filename(
- 'functest', 'ci/rally_aarch64_patch.conf')
+ 'functest', 'ci/rally_aarch64_patch.conf')
class PrepareEnvParser(object):
@@ -358,6 +358,7 @@ def prepare_env(**kwargs):
def main():
logging.config.fileConfig(pkg_resources.resource_filename(
'functest', 'ci/logging.ini'))
+ logging.captureWarnings(True)
parser = PrepareEnvParser()
args = parser.parse_args(sys.argv[1:])
return prepare_env(**args)
diff --git a/functest/ci/run_tests.py b/functest/ci/run_tests.py
index feafa89e..a129ea73 100644
--- a/functest/ci/run_tests.py
+++ b/functest/ci/run_tests.py
@@ -264,6 +264,7 @@ class Runner(object):
def main():
logging.config.fileConfig(pkg_resources.resource_filename(
'functest', 'ci/logging.ini'))
+ logging.captureWarnings(True)
parser = RunTestsParser()
args = parser.parse_args(sys.argv[1:])
runner = Runner()