Merge "Pass kwargs in TempestCommon:configure()"

[functest.git] / functest / ci / testcases.yaml

diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index fe6bb16..dbdf030 100644 (file)
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -3,7 +3,7 @@ tiers:
     -
         name: healthcheck
         order: 0
-        ci_loop: '(daily)|(weekly)'
+        ci_loop: '(merge)|(verify)|(daily)|(weekly)'
         description: >-
             First tier to be executed to verify the basic
             operations in the VIM.
@@ -20,7 +20,7 @@ tiers:
                     snaps.use_keystone is True, functest must have access to
                     the cloud's private network.
                 dependencies:
-                    installer: '^((?!netvirt).)*$'
+                    installer: ''
                     scenario: ''
                 run:
                     module:
@@ -39,7 +39,7 @@ tiers:
                     snaps.use_keystone is True, functest must have access to
                     the cloud's private network.
                 dependencies:
-                    installer: '^((?!netvirt).)*$'
+                    installer: ''
                     scenario: '^((?!lxd).)*$'
                 run:
                     module: 'functest.opnfv_tests.openstack.snaps.api_check'
@@ -112,7 +112,7 @@ tiers:
                     Tempest automatically and depends on the parameters of
                     the OpenStack deplopyment.
                 dependencies:
-                    installer: '^((?!netvirt).)*$'
+                    installer: ''
                     scenario: ''
                 run:
                     module: 'functest.opnfv_tests.openstack.tempest.tempest'
@@ -228,7 +228,7 @@ tiers:
                     the cloud's private network.
 
                 dependencies:
-                    installer: '^((?!netvirt).)*$'
+                    installer: ''
                     scenario: '^((?!lxd).)*$'
                 run:
                     module: 'functest.opnfv_tests.openstack.snaps.smoke'
@@ -267,7 +267,7 @@ tiers:
                 description: >-
                     Test suite from Doctor project.
                 dependencies:
-                    installer: 'apex'
+                    installer: '(apex)|(fuel)|(daisy)'
                     scenario: '^((?!fdio|nofeature).)*$'
                 run:
                     module: 'xtesting.core.feature'
@@ -278,12 +278,13 @@ tiers:
             -
                 case_name: bgpvpn
                 project_name: sdnvpn
+                enabled: false
                 criteria: 100
                 blocking: false
                 description: >-
                     Test suite from SDNVPN project.
                 dependencies:
-                    installer: '(fuel)|(apex)|(netvirt)'
+                    installer: '(fuel)|(apex)'
                     scenario: 'bgpvpn'
                 run:
                     module: 'sdnvpn.test.functest.run_sdnvpn_tests'
@@ -356,7 +357,7 @@ tiers:
                     Tempest automatically and depends on the parameters of
                     the OpenStack deplopyment.
                 dependencies:
-                    installer: '^((?!netvirt).)*$'
+                    installer: ''
                     scenario: ''
                 run:
                     module: 'functest.opnfv_tests.openstack.tempest.tempest'
@@ -371,7 +372,7 @@ tiers:
                     This test case runs the full suite of scenarios of the
                     OpenStack Rally suite using several threads and iterations.
                 dependencies:
-                    installer: '^((?!netvirt).)*$'
+                    installer: ''
                     scenario: ''
                 run:
                     module: 'functest.opnfv_tests.openstack.rally.rally'
@@ -395,7 +396,7 @@ tiers:
                     some signaling traffic.
                 dependencies:
                     installer: ''
-                    scenario: 'os-nosdn-nofeature-.*ha'
+                    scenario: 'os-.*-nofeature-.*ha'
                 run:
                     module: 'functest.opnfv_tests.vnf.ims.cloudify_ims'
                     class: 'CloudifyIms'
@@ -409,7 +410,7 @@ tiers:
                     This test case is vRouter testing.
                 dependencies:
                     installer: ''
-                    scenario: 'os-nosdn-nofeature-.*ha'
+                    scenario: 'os-.*-nofeature-.*ha'
                 run:
                     module: 'functest.opnfv_tests.vnf.router.cloudify_vrouter'
                     class: 'CloudifyVrouter'
@@ -424,7 +425,7 @@ tiers:
                     executor.
                 dependencies:
                     installer: ''
-                    scenario: 'os-nosdn-nofeature-.*ha'
+                    scenario: 'os-.*-nofeature-.*ha'
                 run:
                     module: 'functest.opnfv_tests.vnf.epc.juju_epc'
                     class: 'JujuEpc'