From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Tue, 6 Nov 2018 09:19:55 +0000 (+0100)
Subject: Run vnfs in all scenarios
X-Git-Tag: opnfv-7.1.0~14^2~1
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F59%2F64559%2F1;p=functest.git

Run vnfs in all scenarios

It allows fair comparisons between scenarios (e.g. ovs dpdk).
os-nosdn-calipso-noha could be verified VNFs as well [1].

[1] https://build.opnfv.org/ci/view/functest/job/functest-apex-baremetal-daily-gambia/32/console

Change-Id: I0490eade81c531e38ce7156a61446a9fccaffb17
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 61b708cc0987bf48d07df9d46ed25e4b42c15efc)
---

diff --git a/docker/vnf/testcases.yaml b/docker/vnf/testcases.yaml
index 170eed0e5..9822a515a 100644
--- a/docker/vnf/testcases.yaml
+++ b/docker/vnf/testcases.yaml
@@ -13,8 +13,6 @@ tiers:
                 blocking: false
                 description: >-
                     This test case deploys the Cloudify orchestrator.
-                dependencies:
-                    - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha'
                 run:
                     name: cloudify
             -
@@ -26,8 +24,6 @@ tiers:
                     This test case deploys an OpenSource vIMS solution from
                     Clearwater using the Cloudify orchestrator. It also runs
                     some signaling traffic.
-                dependencies:
-                    - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha'
                 run:
                     name: cloudify_ims
 
@@ -40,8 +36,6 @@ tiers:
                     This test case deploys an OpenSource vIMS solution from
                     Clearwater using the OpenStack Heat orchestrator.
                     It also runs some signaling traffic.
-                dependencies:
-                    - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha'
                 run:
                     name: heat_ims
 
@@ -52,8 +46,6 @@ tiers:
                 blocking: false
                 description: >-
                     This test case is vRouter testing.
-                dependencies:
-                    - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha'
                 run:
                     name: vyos_vrouter
 
@@ -65,7 +57,5 @@ tiers:
                 description: >-
                     vEPC validation with Juju as VNF manager and ABoT as test
                     executor.
-                dependencies:
-                    - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha'
                 run:
                     name: juju_epc
diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index a06f4b97a..9c2764e86 100644
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -537,8 +537,6 @@ tiers:
                 blocking: false
                 description: >-
                     This test case deploys the Cloudify orchestrator.
-                dependencies:
-                    - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha'
                 run:
                     name: cloudify
             -
@@ -564,8 +562,6 @@ tiers:
                     This test case deploys an OpenSource vIMS solution from
                     Clearwater using the OpenStack Heat orchestrator.
                     It also runs some signaling traffic.
-                dependencies:
-                    - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha'
                 run:
                     name: heat_ims
 
@@ -576,8 +572,6 @@ tiers:
                 blocking: false
                 description: >-
                     This test case is vRouter testing.
-                dependencies:
-                    - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha'
                 run:
                     name: vyos_vrouter
 
@@ -589,7 +583,5 @@ tiers:
                 description: >-
                     vEPC validation with Juju as VNF manager and ABoT as test
                     executor.
-                dependencies:
-                    - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha'
                 run:
                     name: juju_epc