X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Fci%2Ftestcases.yaml;h=f948c56608b5cb54c4edf098e8226f9f3ae2b27b;hb=refs%2Fchanges%2F01%2F54701%2F4;hp=87aa26c244afe7098ec2a53d944adf74a401a95d;hpb=ff087a1234a0ef39f5994d53e708a6020ab906b6;p=functest.git

diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index 87aa26c24..f948c5660 100644
--- 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'
@@ -140,14 +140,36 @@ tiers:
                 blocking: false
                 description: >-
                     This test case runs a sub group of tests of the OpenStack
-                    Defcore testcases by using refstack client.
+                    Defcore testcases.
                 dependencies:
                     installer: ''
                     scenario: ''
                 run:
                     module:
-                        'functest.opnfv_tests.openstack.refstack_client.refstack_client'
-                    class: 'RefstackClient'
+                        'functest.opnfv_tests.openstack.refstack.refstack'
+                    class: 'Refstack'
+
+            -
+                case_name: patrole
+                project_name: functest
+                criteria: 100
+                blocking: false
+                description: >-
+                    Test suite from Patrole project.
+                dependencies:
+                    installer: ''
+                    scenario: ''
+                run:
+                    module: 'functest.opnfv_tests.openstack.patrole.patrole'
+                    class: 'Patrole'
+                    args:
+                        role: 'admin'
+                        services:
+                            - 'image'
+                            - 'network'
+                            - 'volume'
+                        exclude:
+                            - 'test_networks_multiprovider_rbac'
 
             -
                 case_name: odl
@@ -206,12 +228,29 @@ tiers:
                     the cloud's private network.
 
                 dependencies:
-                    installer: '^((?!netvirt).)*$'
+                    installer: ''
                     scenario: '^((?!lxd).)*$'
                 run:
                     module: 'functest.opnfv_tests.openstack.snaps.smoke'
                     class: 'SnapsSmoke'
 
+            -
+                case_name: neutron_trunk
+                project_name: functest
+                criteria: 100
+                blocking: false
+                description: >-
+                    This test case runs the neutron trunk subtest of the
+                    OpenStack Tempest suite. The list of test cases is
+                    generated by Tempest having as input the relevant
+                    testcase list file.
+                dependencies:
+                    installer: '(fuel)|(apex)|(compass)'
+                    scenario: ''
+                run:
+                    module: 'functest.opnfv_tests.openstack.tempest.tempest'
+                    class: 'TempestNeutronTrunk'
+
     -
         name: features
         order: 2
@@ -229,9 +268,9 @@ tiers:
                     Test suite from Doctor project.
                 dependencies:
                     installer: 'apex'
-                    scenario: '^((?!fdio).)*$'
+                    scenario: '^((?!fdio|nofeature).)*$'
                 run:
-                    module: 'functest.core.feature'
+                    module: 'xtesting.core.feature'
                     class: 'BashFeature'
                     args:
                         cmd: 'doctor-test'
@@ -244,7 +283,7 @@ tiers:
                 description: >-
                     Test suite from SDNVPN project.
                 dependencies:
-                    installer: '(fuel)|(apex)|(netvirt)'
+                    installer: '(fuel)|(apex)'
                     scenario: 'bgpvpn'
                 run:
                     module: 'sdnvpn.test.functest.run_sdnvpn_tests'
@@ -262,10 +301,8 @@ tiers:
                     installer: ''
                     scenario: 'odl.*sfc'
                 run:
-                    module: 'functest.core.feature'
-                    class: 'BashFeature'
-                    args:
-                        cmd: 'run_sfc_tests.py'
+                    module: 'sfc.tests.functest.run_sfc_tests'
+                    class: 'SfcFunctest'
 
             -
                 case_name: barometercollectd
@@ -319,7 +356,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'
@@ -334,7 +371,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'
@@ -377,37 +414,6 @@ tiers:
                     module: 'functest.opnfv_tests.vnf.router.cloudify_vrouter'
                     class: 'CloudifyVrouter'
 
-            -
-                case_name: orchestra_openims
-                project_name: orchestra
-                enabled: false
-                criteria: 100
-                blocking: false
-                description: >-
-                    OpenIMS VNF deployment with Open Baton (Orchestra)
-                dependencies:
-                    installer: ''
-                    scenario: 'os-nosdn-nofeature-.*ha'
-                run:
-                    module: 'functest.opnfv_tests.vnf.ims.orchestra_openims'
-                    class: 'OpenImsVnf'
-
-            -
-                case_name: orchestra_clearwaterims
-                project_name: orchestra
-                enabled: false
-                criteria: 100
-                blocking: false
-                description: >-
-                    ClearwaterIMS VNF deployment with Open Baton (Orchestra)
-                dependencies:
-                    installer: ''
-                    scenario: 'os-nosdn-nofeature-.*ha'
-                run:
-                    module:
-                        'functest.opnfv_tests.vnf.ims.orchestra_clearwaterims'
-                    class: 'ClearwaterImsVnf'
-
             -
                 case_name: juju_epc
                 project_name: functest