From cb33fa13d1a58dfa52b218e4e5aaf6cfa09b0cae Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Thu, 12 Jul 2018 14:30:21 +0200
Subject: Leverage to Xtesting 0.51
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It removes ci_loop which has been useless from Docker slicing.
It can filter now on any env var (e.g. CI_LOOP if required by XCI).

Change-Id: Ibd685edf4636bd251c85466e8b4febcd1e20d312
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
 docker/smoke/testcases.yaml | 29 +++--------------------------
 1 file changed, 3 insertions(+), 26 deletions(-)

(limited to 'docker/smoke')

diff --git a/docker/smoke/testcases.yaml b/docker/smoke/testcases.yaml
index 916aa2919..aed2a64ec 100644
--- a/docker/smoke/testcases.yaml
+++ b/docker/smoke/testcases.yaml
@@ -3,7 +3,6 @@ tiers:
     -
         name: smoke
         order: 1
-        ci_loop: '(daily)|(weekly)'
         description: >-
             Set of basic Functional tests to validate the OPNFV scenarios.
         testcases:
@@ -17,9 +16,6 @@ tiers:
                     Tempest suite. The list of test cases is generated by
                     Tempest automatically and depends on the parameters of
                     the OpenStack deplopyment.
-                dependencies:
-                    installer: ''
-                    scenario: ''
                 run:
                     module: 'functest.opnfv_tests.openstack.tempest.tempest'
                     class: 'TempestCommon'
@@ -34,9 +30,6 @@ tiers:
                 description: >-
                     This test case runs a sub group of tests of the OpenStack
                     Rally suite in smoke mode.
-                dependencies:
-                    installer: ''
-                    scenario: ''
                 run:
                     module: 'functest.opnfv_tests.openstack.rally.rally'
                     class: 'RallySanity'
@@ -50,9 +43,6 @@ tiers:
                 description: >-
                     This test case runs a sub group of tests of the OpenStack
                     Defcore testcases.
-                dependencies:
-                    installer: ''
-                    scenario: ''
                 run:
                     module:
                         'functest.opnfv_tests.openstack.refstack.refstack'
@@ -65,9 +55,6 @@ tiers:
                 blocking: false
                 description: >-
                     Test suite from Patrole project.
-                dependencies:
-                    installer: ''
-                    scenario: ''
                 run:
                     module: 'functest.opnfv_tests.openstack.patrole.patrole'
                     class: 'Patrole'
@@ -88,9 +75,6 @@ tiers:
                     VMTP is a small python application that will automatically
                     perform ping connectivity, round trip time measurement
                     (latency) and TCP/UDP throughput
-                dependencies:
-                    installer: ''
-                    scenario: ''
                 run:
                     module:
                         'functest.opnfv_tests.openstack.vmtp.vmtp'
@@ -106,9 +90,6 @@ tiers:
                     like iperf, iperf3 and netperf (with help of flent). Shaker
                     is able to deploy OpenStack instances and networks in
                     different topologies.
-                dependencies:
-                    installer: ''
-                    scenario: ''
                 run:
                     module:
                         'functest.opnfv_tests.openstack.shaker.shaker'
@@ -127,10 +108,8 @@ tiers:
                     this functionality. When the config value of
                     snaps.use_keystone is True, functest must have access to
                     the cloud's private network.
-
                 dependencies:
-                    installer: ''
-                    scenario: '^((?!lxd).)*$'
+                    - DEPLOY_SCENARIO: '^((?!lxd).)*$'
                 run:
                     module: 'functest.opnfv_tests.openstack.snaps.smoke'
                     class: 'SnapsSmoke'
@@ -146,8 +125,7 @@ tiers:
                     generated by Tempest having as input the relevant
                     testcase list file.
                 dependencies:
-                    installer: '(fuel)|(apex)|(compass)'
-                    scenario: ''
+                    - INSTALLER_TYPE: '(fuel)|(apex)|(compass)'
                 run:
                     module: 'functest.opnfv_tests.openstack.trunk.trunk'
                     class: 'TempestNeutronTrunk'
@@ -163,8 +141,7 @@ tiers:
                     It leverages on the tempest plugin containing tests used to
                     verify the functionality of a barbican installation
                 dependencies:
-                    installer: '^((?!fuel|apex|compass|daisy|osa).)*$'
-                    scenario: ''
+                    - INSTALLER_TYPE: '^((?!fuel|apex|compass|daisy|osa).)*$'
                 run:
                     module: 'functest.opnfv_tests.openstack.tempest.tempest'
                     class: 'TempestCommon'
-- 
cgit 1.2.3-korg