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-Tag: 0.2~152^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=fa10ca0a16ab8d560b15814ce91e379e01b10030;p=functest-xtesting.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>
---

diff --git a/docker/vnf/testcases.yaml b/docker/vnf/testcases.yaml
index 8b889d02..b2b6909b 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 6547ca78..8b0f0ca7 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: