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 8dc22a6..962d963 100644 (file)
--- a/ci/testcases.yaml
+++ b/ci/testcases.yaml
@@ -2,7 +2,7 @@ tiers:
     -
         name: healthcheck
         order: 0
-        ci: daily
+        ci_loop: '(daily)|(weekly)'
         description : >-
             First tier to be executed to verify the basic
             operations in the VIM.
@@ -20,26 +20,25 @@ tiers:
     -
         name: smoke
         order: 1
-        ci: daily
+        ci_loop: '(daily)|(weekly)'
         description : >-
             Set of basic Functional tests to validate the OpenStack deployment.
         testcases:
             -
                 name: vping_ssh
-                description: |-
-                    This test case verifies:
-                    ····1) SSH to an instance using floating IPs over the public network.
-                    ····2) Connectivity between 2 instances over a private network.
+                description: >-
+                    This test case verifies: 1) SSH to an instance using floating
+                    IPs over the public network. 2) Connectivity between 2 instances
+                    over a private network.
                 dependencies:
                     installer: ''
                     scenario: '^((?!bgpvpn).)*$'
 
             -
                 name: vping_userdata
-                description: |-
-                    This test case verifies:
-                    ····1) Boot a VM with given userdata.
-                    ····2) Connectivity between 2 instances over a private network.
+                description: >-
+                    This test case verifies:  1) Boot a VM with given userdata.
+                    2) Connectivity between 2 instances over a private network.
                 dependencies:
                     installer: ''
                     scenario: ''
@@ -49,7 +48,7 @@ tiers:
                 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
+                    Tempest automatically and depends on the parameters of
                     the OpenStack deplopyment.
                 dependencies:
                     installer: ''
@@ -64,20 +63,10 @@ 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
-        ci: daily
+        ci_loop: '(daily)|(weekly)'
         description : >-
             Test suites corresponding to the different
             SDN Controllers existing in OPNFV.
@@ -114,7 +103,7 @@ tiers:
     -
         name: features
         order: 3
-        ci: daily
+        ci_loop: '(daily)|(weekly)'
         description : >-
             Test suites from feature projects
             integrated in functest
@@ -130,13 +119,13 @@ tiers:
             -
                 name: doctor
                 description: >-
-                    Test suite from Dcotor project.
+                    Test suite from Doctor project.
                 dependencies:
                     installer: 'apex'
                     scenario: ''
 
             -
-                name: sdnvpn
+                name: bgpvpn
                 description: >-
                     Test suite from SDNVPN project.
                 dependencies:
@@ -144,29 +133,22 @@ tiers:
                     scenario: 'bgpvpn'
 
     -
-        name: tempest
+        name: openstack
         order: 4
-        ci: weekly
+        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
                 description: >-
                     The list of test cases is generated by
-                    Tempest automatically and depend on the parameters of
+                    Tempest automatically and depends on the parameters of
                     the OpenStack deplopyment.
                 dependencies:
                     installer: ''
                     scenario: ''
 
-    -
-        name: rally
-        order: 5
-        ci: weekly
-        description : >-
-            Rally suite from the OpenStack community.
-        testcases:
             -
                 name: rally_full
                 description: >-
@@ -178,8 +160,8 @@ tiers:
 
     -
         name: vnf
-        order: 6
-        ci: weekly
+        order: 5
+        ci_loop: 'weekly'
         description : >-
             Collection of VNF test cases.
         testcases: