Filter only on scenarios if possible

If a scenario is defined, setting installers as dependencies makes
the maintenance more difficult.

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

diff --git a/docker/features/testcases.yaml b/docker/features/testcases.yaml
index a0cf3f9..2187b00 100644 (file)
--- a/docker/features/testcases.yaml
+++ b/docker/features/testcases.yaml
@@ -32,7 +32,7 @@ tiers:
                 description: >-
                     Test suite from SDNVPN project.
                 dependencies:
-                    installer: '(fuel)|(apex)'
+                    installer: ''
                     scenario: 'bgpvpn'
                 run:
                     module: 'sdnvpn.test.functest.run_sdnvpn_tests'
@@ -63,7 +63,7 @@ tiers:
                     the proper configuration and basic functionality of all the
                     collectd plugins as described in the Project Release Plan
                 dependencies:
-                    installer: '(apex)|(compass)'
+                    installer: ''
                     scenario: 'bar'
                 run:
                     module: 'baro_tests.barometer'
@@ -79,7 +79,7 @@ tiers:
                     features are installed. It integrates some test suites from
                     upstream using Robot as the test framework.
                 dependencies:
-                    installer: 'apex'
+                    installer: ''
                     scenario: 'odl.*-fdio'
                 run:
                     module: 'functest.opnfv_tests.sdn.odl.odl'

diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index be0da60..fd70c88 100644 (file)
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -283,7 +283,7 @@ tiers:
                 description: >-
                     Test suite from SDNVPN project.
                 dependencies:
-                    installer: '(fuel)|(apex)'
+                    installer: ''
                     scenario: 'bgpvpn'
                 run:
                     module: 'sdnvpn.test.functest.run_sdnvpn_tests'
@@ -314,7 +314,7 @@ tiers:
                     the proper configuration and basic functionality of all the
                     collectd plugins as described in the Project Release Plan
                 dependencies:
-                    installer: '(apex)|(compass)'
+                    installer: ''
                     scenario: 'bar'
                 run:
                     module: 'baro_tests.barometer'
@@ -330,7 +330,7 @@ tiers:
                     features are installed. It integrates some test suites from
                     upstream using Robot as the test framework.
                 dependencies:
-                    installer: 'apex'
+                    installer: ''
                     scenario: 'odl.*-fdio'
                 run:
                     module: 'functest.opnfv_tests.sdn.odl.odl'