summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2018-11-06 13:14:06 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-11-06 13:14:07 +0000
commitbb33342c56e9a7c1a723637179e91aa79be7c0a6 (patch)
treed0826320aab0dbcd7ad09be8448f63f110a4e9f1
parente715a8309122c3fa3b4983cfa53c82519dd6ead7 (diff)
parent023a4c7d0cb85d3b624ee946097e721880169371 (diff)
Merge changes If9b61064,I0490eade
* 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 16365b0b7..095e2f955 100644
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -560,8 +560,6 @@ tiers:
blocking: false
description: >-
This test case deploys the Cloudify orchestrator.
- dependencies:
- - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha'
run:
name: cloudify
-
@@ -587,8 +585,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
@@ -599,8 +595,6 @@ tiers:
blocking: false
description: >-
This test case is vRouter testing.
- dependencies:
- - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha'
run:
name: vyos_vrouter
@@ -612,7 +606,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: