summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2017-12-19 11:10:21 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-12-19 11:10:21 +0000
commit5c20154ceafd6d2dc1e625e2e1b5bc335f1084a6 (patch)
treea91e6752432d500bc0b84415933bd3b442d03c6c
parent41380d84c1b9e90383f32d967b2d641a94516d1c (diff)
parentfa10ca0a16ab8d560b15814ce91e379e01b10030 (diff)
Merge "Filter out orchestra for ssl enabled deployments"
-rw-r--r--docker/vnf/testcases.yaml4
-rw-r--r--functest/ci/testcases.yaml4
2 files changed, 4 insertions, 4 deletions
diff --git a/docker/vnf/testcases.yaml b/docker/vnf/testcases.yaml
index 8b889d028..b2b6909b8 100644
--- a/docker/vnf/testcases.yaml
+++ b/docker/vnf/testcases.yaml
@@ -45,7 +45,7 @@ tiers:
description: >-
OpenIMS VNF deployment with Open Baton (Orchestra)
dependencies:
- installer: ''
+ installer: '^((?!compass|fuel).)*$'
scenario: 'os-nosdn-nofeature-ha'
run:
module: 'functest.opnfv_tests.vnf.ims.orchestra_openims'
@@ -59,7 +59,7 @@ tiers:
description: >-
ClearwaterIMS VNF deployment with Open Baton (Orchestra)
dependencies:
- installer: ''
+ installer: '^((?!compass|fuel).)*$'
scenario: 'os-nosdn-nofeature-ha'
run:
module:
diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index 6547ca78a..8b0f0ca72 100644
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -385,7 +385,7 @@ tiers:
description: >-
OpenIMS VNF deployment with Open Baton (Orchestra)
dependencies:
- installer: ''
+ installer: '^((?!compass|fuel).)*$'
scenario: 'os-nosdn-nofeature-ha'
run:
module: 'functest.opnfv_tests.vnf.ims.orchestra_openims'
@@ -399,7 +399,7 @@ tiers:
description: >-
ClearwaterIMS VNF deployment with Open Baton (Orchestra)
dependencies:
- installer: ''
+ installer: '^((?!compass|fuel).)*$'
scenario: 'os-nosdn-nofeature-ha'
run:
module: