From: Michael Polenchuk <mpolenchuk@mirantis.com>
Date: Fri, 15 Dec 2017 11:11:40 +0000 (+0400)
Subject: Filter out orchestra for ssl enabled deployments
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F81%2F49281%2F1;p=functest.git

Filter out orchestra for ssl enabled deployments

Skip orchestra tests for the Compass & Fuel/MCP installers
until OpenBaton have updated to version 4.x+ with SSL support.

JIRA: ORCHESTRA-17
Change-Id: I894a08fb5ac83a6b1d59d7bcf3a681a8d596968f
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit fa10ca0a16ab8d560b15814ce91e379e01b10030)
---

diff --git a/docker/vnf/testcases.yaml b/docker/vnf/testcases.yaml
index 7205ec551..b6ab4cf95 100644
--- a/docker/vnf/testcases.yaml
+++ b/docker/vnf/testcases.yaml
@@ -43,7 +43,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'
@@ -57,7 +57,7 @@ tiers:
                 description: >-
                     ClearwaterIMS VNF deployment with Open Baton (Orchestra)
                 dependencies:
-                    installer: ''
+                    installer: '^((?!compass|fuel).)*$'
                     scenario: 'os-nosdn-nofeature-ha'
                 run:
                     module: 'functest.opnfv_tests.vnf.ims.orchestra_clearwaterims'
diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index 8e48f42ca..229ee5175 100644
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -411,7 +411,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'
@@ -425,7 +425,7 @@ tiers:
                 description: >-
                     ClearwaterIMS VNF deployment with Open Baton (Orchestra)
                 dependencies:
-                    installer: ''
+                    installer: '^((?!compass|fuel).)*$'
                     scenario: 'os-nosdn-nofeature-ha'
                 run:
                     module: 'functest.opnfv_tests.vnf.ims.orchestra_clearwaterims'