Merge "Filter out orchestra for ssl enabled deployments"

diff --git a/docker/vnf/testcases.yaml b/docker/vnf/testcases.yaml
index 8b889d0..b2b6909 100644 (file)
--- 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 6547ca7..8b0f0ca 100644 (file)
--- 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: