From eb8f57466325f398c6b8b5f4d15005c71879a269 Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Tue, 3 Jul 2018 15:28:38 +0200
Subject: Refactor tempest common
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It also renames two testcases and updates all docs because tests
run in parallel in case of tempest smoke.

To force one thread as before:
run:
    module: 'functest.opnfv_tests.openstack.tempest.tempest'
    class: 'TempestCommon'
    args:
        mode: '^tempest\.(api|scenario).*\[.*\bsmoke\b.*\]$'
        option:
            - '--concurrency=1'

JIRA: FUNCTEST-989

Change-Id: I1348f5908400a5046be8edf983db4afa12e546c3
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
 docker/components/testcases.yaml |  6 ++++--
 docker/smoke/testcases.yaml      | 14 ++++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

(limited to 'docker')

diff --git a/docker/components/testcases.yaml b/docker/components/testcases.yaml
index ce55d85a8..081dc4c51 100644
--- a/docker/components/testcases.yaml
+++ b/docker/components/testcases.yaml
@@ -8,7 +8,7 @@ tiers:
             Extensive testing of OpenStack API.
         testcases:
             -
-                case_name: tempest_full_parallel
+                case_name: tempest_full
                 project_name: functest
                 criteria: 80
                 blocking: false
@@ -21,7 +21,9 @@ tiers:
                     scenario: ''
                 run:
                     module: 'functest.opnfv_tests.openstack.tempest.tempest'
-                    class: 'TempestFullParallel'
+                    class: 'TempestCommon'
+                    args:
+                        mode: '^tempest\.'
 
             -
                 case_name: rally_full
diff --git a/docker/smoke/testcases.yaml b/docker/smoke/testcases.yaml
index 5a93a1d7c..3bfca8686 100644
--- a/docker/smoke/testcases.yaml
+++ b/docker/smoke/testcases.yaml
@@ -8,7 +8,7 @@ tiers:
             Set of basic Functional tests to validate the OPNFV scenarios.
         testcases:
             -
-                case_name: tempest_smoke_serial
+                case_name: tempest_smoke
                 project_name: functest
                 criteria: 100
                 blocking: false
@@ -22,7 +22,9 @@ tiers:
                     scenario: ''
                 run:
                     module: 'functest.opnfv_tests.openstack.tempest.tempest'
-                    class: 'TempestSmokeSerial'
+                    class: 'TempestCommon'
+                    args:
+                        mode: '^tempest\.(api|scenario).*\[.*\bsmoke\b.*\]$'
 
             -
                 case_name: rally_sanity
@@ -130,8 +132,10 @@ tiers:
                     installer: '(fuel)|(apex)|(compass)'
                     scenario: ''
                 run:
-                    module: 'functest.opnfv_tests.openstack.tempest.tempest'
+                    module: 'functest.opnfv_tests.openstack.trunk.trunk'
                     class: 'TempestNeutronTrunk'
+                    args:
+                        mode: 'neutron_tempest_plugin.(api|scenario).test_trunk'
 
             -
                 case_name: barbican
@@ -146,4 +150,6 @@ tiers:
                     scenario: ''
                 run:
                     module: 'functest.opnfv_tests.openstack.tempest.tempest'
-                    class: 'TempestBarbican'
+                    class: 'TempestCommon'
+                    args:
+                        mode: 'barbican_tempest_plugin.tests.(api|scenario)'
-- 
cgit 1.2.3-korg