Join Rally_full and Tempest_full in the same Tier

JIRA: FUNCTEST-190

Change-Id: Ib82c59e0a68ed73caba79a0d5b2000861ee31552
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>

diff --git a/ci/testcases.yaml b/ci/testcases.yaml
index 663dc2a..962d963 100644 (file)
--- a/ci/testcases.yaml
+++ b/ci/testcases.yaml
@@ -63,16 +63,6 @@ tiers:
                     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: sdn_suites
         order: 2
@@ -143,11 +133,11 @@ 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_full_parallel
@@ -159,13 +149,6 @@ tiers:
                     installer: ''
                     scenario: ''
 
-    -
-        name: rally
-        order: 5
-        ci_loop: 'weekly'
-        description : >-
-            Rally suite from the OpenStack community.
-        testcases:
             -
                 name: rally_full
                 description: >-
@@ -177,7 +160,7 @@ tiers:
 
     -
         name: vnf
-        order: 6
+        order: 5
         ci_loop: 'weekly'
         description : >-
             Collection of VNF test cases.