summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2018-04-09 15:19:46 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-04-09 15:19:46 +0000
commit82866536463844280aee127e9f13eacda5dcf694 (patch)
treeb410359a7ed9fc7b214ca3e298bee66d164eff5e
parent3ffe17b8a4e2082ea711056aba750c9a3cff2659 (diff)
parentd78693808c999538124e578ef6894dd49dd26077 (diff)
Merge "Run all VNFs vs SDN scenarios" into stable/fraser
-rw-r--r--docker/vnf/testcases.yaml6
-rw-r--r--functest/ci/testcases.yaml6
2 files changed, 6 insertions, 6 deletions
diff --git a/docker/vnf/testcases.yaml b/docker/vnf/testcases.yaml
index dbf470dd0..938f0b309 100644
--- a/docker/vnf/testcases.yaml
+++ b/docker/vnf/testcases.yaml
@@ -18,7 +18,7 @@ tiers:
some signaling traffic.
dependencies:
installer: ''
- scenario: 'os-nosdn-nofeature-.*ha'
+ scenario: 'os-.*-nofeature-.*ha'
run:
module: 'functest.opnfv_tests.vnf.ims.cloudify_ims'
class: 'CloudifyIms'
@@ -32,7 +32,7 @@ tiers:
This test case is vRouter testing.
dependencies:
installer: ''
- scenario: 'os-nosdn-nofeature-.*ha'
+ scenario: 'os-.*-nofeature-.*ha'
run:
module: 'functest.opnfv_tests.vnf.router.cloudify_vrouter'
class: 'CloudifyVrouter'
@@ -47,7 +47,7 @@ tiers:
executor.
dependencies:
installer: ''
- scenario: 'os-nosdn-nofeature-.*ha'
+ scenario: 'os-.*-nofeature-.*ha'
run:
module: 'functest.opnfv_tests.vnf.epc.juju_epc'
class: 'JujuEpc'
diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index 8676643da..13328c1a0 100644
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -395,7 +395,7 @@ tiers:
some signaling traffic.
dependencies:
installer: ''
- scenario: 'os-nosdn-nofeature-.*ha'
+ scenario: 'os-.*-nofeature-.*ha'
run:
module: 'functest.opnfv_tests.vnf.ims.cloudify_ims'
class: 'CloudifyIms'
@@ -409,7 +409,7 @@ tiers:
This test case is vRouter testing.
dependencies:
installer: ''
- scenario: 'os-nosdn-nofeature-.*ha'
+ scenario: 'os-.*-nofeature-.*ha'
run:
module: 'functest.opnfv_tests.vnf.router.cloudify_vrouter'
class: 'CloudifyVrouter'
@@ -424,7 +424,7 @@ tiers:
executor.
dependencies:
installer: ''
- scenario: 'os-nosdn-nofeature-.*ha'
+ scenario: 'os-.*-nofeature-.*ha'
run:
module: 'functest.opnfv_tests.vnf.epc.juju_epc'
class: 'JujuEpc'