summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2017-11-30 06:53:01 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2017-11-30 09:26:03 +0100
commita6ef634a1bc7ba1f877f421bfcb7532d9501c045 (patch)
tree66ef22ffd96e0492957b52359e14863bf8594a53
parentc0aa53c61fdee02bc880a962b9a3de34411ec8eb (diff)
Filter installers for cloudify_vrouter
As cloudify_vrouter doesn't support SSL endpoints [1], it shouldn't be executed if compass or fuel. [1] https://jira.opnfv.org/browse/FUNCTEST-881 Change-Id: Ieedc0d5eca57f00da2121c9e07dd5cc57f978ef6 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit b5c7a96a1eb523e1c89f3ea9d143ddf39c518022)
-rw-r--r--docker/vnf/testcases.yaml4
-rw-r--r--functest/ci/testcases.yaml2
2 files changed, 3 insertions, 3 deletions
diff --git a/docker/vnf/testcases.yaml b/docker/vnf/testcases.yaml
index 5db81b89f..d89be6fe3 100644
--- a/docker/vnf/testcases.yaml
+++ b/docker/vnf/testcases.yaml
@@ -57,8 +57,8 @@ tiers:
description: >-
This test case is vRouter testing.
dependencies:
- installer: ''
- scenario: 'nosdn-nofeature'
+ installer: '^((?!compass|fuel).)*$'
+ scenario: 'os-nosdn-nofeature-ha'
run:
module: 'functest.opnfv_tests.vnf.router.cloudify_vrouter'
class: 'CloudifyVrouter'
diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index 0bdd9bd3a..c099eb934 100644
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -425,7 +425,7 @@ tiers:
description: >-
This test case is vRouter testing.
dependencies:
- installer: ''
+ installer: '^((?!compass|fuel).)*$'
scenario: 'os-nosdn-nofeature-ha'
run:
module: 'functest.opnfv_tests.vnf.router.cloudify_vrouter'