Join Rally_full and Tempest_full in the same Tier

[functest.git] / ci / testcases.yaml

diff --git a/ci/testcases.yaml b/ci/testcases.yaml
index 0450681..962d963 100644 (file)
--- a/ci/testcases.yaml
+++ b/ci/testcases.yaml
@@ -43,35 +43,25 @@ tiers:
                     installer: ''
                     scenario: ''
 
-            #-
-            #    name: tempest_smoke_serial
-            #    description: >-
-            #        This test case runs the smoke subset of the OpenStack
-            #        Tempest suite. The list of test cases is generated by
-            #        Tempest automatically and depend on the parameters of
-            #        the OpenStack deplopyment.
-            #    dependencies:
-            #        installer: ''
-            #        scenario: ''
-            #
-            #-
-            #    name: rally_sanity
-            #    description: >-
-            #        This test case runs a sub group of tests of the OpenStack
-            #        Rally suite in smoke mode.
-            #    dependencies:
-            #        installer: ''
-            #        scenario: ''
-            #
-            #-
-            #    name: security_groups
-            #    description: >-
-            #        This test case verifies the functionality of the OpenStack
-            #        security groups and that the port rules created are
-            #        fullfilled.
-            #    dependencies:
-            #        installer: ''
-            #        scenario: ''
+            -
+                name: tempest_smoke_serial
+                description: >-
+                    This test case runs the smoke subset of the OpenStack
+                    Tempest suite. The list of test cases is generated by
+                    Tempest automatically and depends on the parameters of
+                    the OpenStack deplopyment.
+                dependencies:
+                    installer: ''
+                    scenario: ''
+
+            -
+                name: rally_sanity
+                description: >-
+                    This test case runs a sub group of tests of the OpenStack
+                    Rally suite in smoke mode.
+                dependencies:
+                    installer: ''
+                    scenario: ''
 
     -
         name: sdn_suites
@@ -129,7 +119,7 @@ tiers:
             -
                 name: doctor
                 description: >-
-                    Test suite from Dcotor project.
+                    Test suite from Doctor project.
                 dependencies:
                     installer: 'apex'
                     scenario: ''
@@ -143,14 +133,14 @@ tiers:
                     scenario: 'bgpvpn'
 
     -
-        name: tempest
+        name: openstack
         order: 4
         ci_loop: 'weekly'
         description : >-
-            This test case runs the full set of the OpenStack Tempest suite.
+            Extensive testing of OpenStack API.
         testcases:
             -
-                name: tempest
+                name: tempest_full_parallel
                 description: >-
                     The list of test cases is generated by
                     Tempest automatically and depends on the parameters of
@@ -159,15 +149,8 @@ tiers:
                     installer: ''
                     scenario: ''
 
-    -
-        name: rally
-        order: 5
-        ci_loop: 'weekly'
-        description : >-
-            Rally suite from the OpenStack community.
-        testcases:
             -
-                name: rally
+                name: rally_full
                 description: >-
                     This test case runs the full suite of scenarios of the OpenStack
                     Rally suite using several threads and iterations.
@@ -177,7 +160,7 @@ tiers:
 
     -
         name: vnf
-        order: 6
+        order: 5
         ci_loop: 'weekly'
         description : >-
             Collection of VNF test cases.