Move testcases in the right tiers

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

diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index e5e762f..2e0018d 100644 (file)
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -172,12 +172,6 @@ tiers:
                 run:
                     name: snaps_health_check
 
-    -
-        name: smoke
-        order: 1
-        description: >-
-            Set of basic Functional tests to validate the OPNFV scenarios.
-        testcases:
             -
                 case_name: tempest_smoke
                 project_name: functest
@@ -196,6 +190,12 @@ tiers:
                         option:
                             - '--concurrency=4'
 
+    -
+        name: smoke
+        order: 1
+        description: >-
+            Set of basic Functional tests to validate the OPNFV scenarios.
+        testcases:
             -
                 case_name: neutron-tempest-plugin-api
                 project_name: functest
@@ -225,30 +225,53 @@ tiers:
                     name: rally_sanity
 
             -
-                case_name: rally_jobs
+                case_name: refstack_defcore
                 project_name: functest
                 criteria: 100
                 blocking: false
                 description: >-
-                    This test case runs a group of Rally jobs used in
-                    OpenStack gating
+                    This test case runs a sub group of tests of the OpenStack
+                    Defcore testcases.
                 run:
-                    name: rally_jobs
+                    name: refstack_defcore
+                    args:
+                        option:
+                            - '--concurrency=4'
 
             -
-                case_name: refstack_defcore
+                case_name: tempest_full
                 project_name: functest
                 criteria: 100
                 blocking: false
                 description: >-
-                    This test case runs a sub group of tests of the OpenStack
-                    Defcore testcases.
+                    The list of test cases is generated by
+                    Tempest automatically and depends on the parameters of
+                    the OpenStack deployment.
+                    https://github.com/openstack/tempest/blob/18.0.0/tox.ini#L83
                 run:
-                    name: refstack_defcore
+                    name: tempest_common
                     args:
+                        mode: '(?!.*\[.*\bslow\b.*\])(^tempest\.api)'
                         option:
                             - '--concurrency=4'
 
+            -
+                case_name: tempest_scenario
+                project_name: functest
+                criteria: 100
+                blocking: false
+                description: >-
+                    The list of test cases is generated by
+                    Tempest automatically and depends on the parameters of
+                    the OpenStack deployment.
+                    https://github.com/openstack/tempest/blob/18.0.0/tox.ini#L84
+                run:
+                    name: tempest_common
+                    args:
+                        mode: '(?!.*\[.*\bslow\b.*\])(^tempest\.scenario)'
+                        option:
+                            - '--concurrency=1'
+
             -
                 case_name: patrole
                 project_name: functest
@@ -363,6 +386,17 @@ tiers:
             Run several OpenStack performance tools
             https://docs.openstack.org/performance-docs/latest/methodologies/tools.html
         testcases:
+            -
+                case_name: rally_jobs
+                project_name: functest
+                criteria: 100
+                blocking: false
+                description: >-
+                    This test case runs a group of Rally jobs used in
+                    OpenStack gating
+                run:
+                    name: rally_jobs
+
             -
                 case_name: vmtp
                 project_name: functest
@@ -487,40 +521,6 @@ tiers:
         description: >-
             Extensive testing of OpenStack API.
         testcases:
-            -
-                case_name: tempest_full
-                project_name: functest
-                criteria: 100
-                blocking: false
-                description: >-
-                    The list of test cases is generated by
-                    Tempest automatically and depends on the parameters of
-                    the OpenStack deployment.
-                    https://github.com/openstack/tempest/blob/18.0.0/tox.ini#L83
-                run:
-                    name: tempest_common
-                    args:
-                        mode: '(?!.*\[.*\bslow\b.*\])(^tempest\.api)'
-                        option:
-                            - '--concurrency=4'
-
-            -
-                case_name: tempest_scenario
-                project_name: functest
-                criteria: 100
-                blocking: false
-                description: >-
-                    The list of test cases is generated by
-                    Tempest automatically and depends on the parameters of
-                    the OpenStack deployment.
-                    https://github.com/openstack/tempest/blob/18.0.0/tox.ini#L84
-                run:
-                    name: tempest_common
-                    args:
-                        mode: '(?!.*\[.*\bslow\b.*\])(^tempest\.scenario)'
-                        option:
-                            - '--concurrency=1'
-
             -
                 case_name: rally_full
                 project_name: functest