aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2018-11-06 13:14:19 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-11-06 13:14:19 +0000
commitf4d583a2e1638daaef2b517a59a05649a1950d3a (patch)
tree7aac82e1c5963f5f97976102c708132a339406f8
parented1d98d093d6d1428c5d14c5bb6de3ac21ec584e (diff)
parent751ee5f319c10585c85494cc1cf7e0bc50518021 (diff)
Merge changes If9b61064,I0490eade into stable/gambia
* changes: Increase Vmtp timeouts Run vnfs in all scenarios
-rw-r--r--docker/vnf/testcases.yaml10
-rw-r--r--functest/ci/testcases.yaml8
-rw-r--r--functest/opnfv_tests/openstack/vmtp/vmtp.py1
3 files changed, 1 insertions, 18 deletions
diff --git a/docker/vnf/testcases.yaml b/docker/vnf/testcases.yaml
index 170eed0e5..9822a515a 100644
--- a/docker/vnf/testcases.yaml
+++ b/docker/vnf/testcases.yaml
@@ -13,8 +13,6 @@ tiers:
blocking: false
description: >-
This test case deploys the Cloudify orchestrator.
- dependencies:
- - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha'
run:
name: cloudify
-
@@ -26,8 +24,6 @@ tiers:
This test case deploys an OpenSource vIMS solution from
Clearwater using the Cloudify orchestrator. It also runs
some signaling traffic.
- dependencies:
- - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha'
run:
name: cloudify_ims
@@ -40,8 +36,6 @@ tiers:
This test case deploys an OpenSource vIMS solution from
Clearwater using the OpenStack Heat orchestrator.
It also runs some signaling traffic.
- dependencies:
- - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha'
run:
name: heat_ims
@@ -52,8 +46,6 @@ tiers:
blocking: false
description: >-
This test case is vRouter testing.
- dependencies:
- - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha'
run:
name: vyos_vrouter
@@ -65,7 +57,5 @@ tiers:
description: >-
vEPC validation with Juju as VNF manager and ABoT as test
executor.
- dependencies:
- - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha'
run:
name: juju_epc
diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index a06f4b97a..9c2764e86 100644
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -537,8 +537,6 @@ tiers:
blocking: false
description: >-
This test case deploys the Cloudify orchestrator.
- dependencies:
- - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha'
run:
name: cloudify
-
@@ -564,8 +562,6 @@ tiers:
This test case deploys an OpenSource vIMS solution from
Clearwater using the OpenStack Heat orchestrator.
It also runs some signaling traffic.
- dependencies:
- - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha'
run:
name: heat_ims
@@ -576,8 +572,6 @@ tiers:
blocking: false
description: >-
This test case is vRouter testing.
- dependencies:
- - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha'
run:
name: vyos_vrouter
@@ -589,7 +583,5 @@ tiers:
description: >-
vEPC validation with Juju as VNF manager and ABoT as test
executor.
- dependencies:
- - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha'
run:
name: juju_epc
diff --git a/functest/opnfv_tests/openstack/vmtp/vmtp.py b/functest/opnfv_tests/openstack/vmtp/vmtp.py
index d37e344ce..2e0be28ad 100644
--- a/functest/opnfv_tests/openstack/vmtp/vmtp.py
+++ b/functest/opnfv_tests/openstack/vmtp/vmtp.py
@@ -50,6 +50,7 @@ class Vmtp(singlevm.VmReady2):
flavor_ram = 2048
flavor_vcpus = 1
flavor_disk = 0
+ create_server_timeout = 300
def __init__(self, **kwargs):
if "case_name" not in kwargs: