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/healthcheck/testcases.yaml | 40 +++------------------------------------
 1 file changed, 3 insertions(+), 37 deletions(-)

(limited to 'docker/healthcheck/testcases.yaml')

diff --git a/docker/healthcheck/testcases.yaml b/docker/healthcheck/testcases.yaml
index dd26e7695..75c186d75 100644
--- a/docker/healthcheck/testcases.yaml
+++ b/docker/healthcheck/testcases.yaml
@@ -3,7 +3,6 @@ tiers:
     -
         name: healthcheck
         order: 0
-        ci_loop: '(merge)|(verify)|(daily)|(weekly)'
         description: >-
             First tier to be executed to verify the basic
             operations in the VIM.
@@ -17,9 +16,6 @@ tiers:
                     This test case verifies the retrieval of OpenStack clients:
                     Keystone, Glance, Neutron and Nova and may perform some
                     simple queries.
-                dependencies:
-                    installer: ''
-                    scenario: ''
                 run:
                     module:
                         'functest.opnfv_tests.openstack.api.connection_check'
@@ -34,9 +30,6 @@ tiers:
                     It creates and configures all tenant network ressources
                     required by advanced testcases (subnet, network and
                     router).
-                dependencies:
-                    installer: ''
-                    scenario: ''
                 run:
                     module: 'functest.core.tenantnetwork'
                     class: 'TenantNetwork1'
@@ -50,9 +43,6 @@ tiers:
                     It creates new user/project before creating and configuring
                     all tenant network ressources required by a testcase
                     (subnet, network and router).
-                dependencies:
-                    installer: ''
-                    scenario: ''
                 run:
                     module: 'functest.core.tenantnetwork'
                     class: 'TenantNetwork2'
@@ -66,9 +56,6 @@ tiers:
                     It inherits from TenantNetwork1 which creates all network
                     resources and prepares a future VM attached to that
                     network.
-                dependencies:
-                    installer: ''
-                    scenario: ''
                 run:
                     module: 'functest.core.singlevm'
                     class: 'VmReady1'
@@ -82,9 +69,6 @@ tiers:
                     It creates new user/project before creating and configuring
                     all tenant network ressources, flavors, images, etc.
                     required by advanced testcases.
-                dependencies:
-                    installer: ''
-                    scenario: ''
                 run:
                     module: 'functest.core.singlevm'
                     class: 'VmReady2'
@@ -98,9 +82,6 @@ tiers:
                     It inherits from TenantNetwork1 which creates all network
                     resources and completes it by booting a VM attached to that
                     network.
-                dependencies:
-                    installer: ''
-                    scenario: ''
                 run:
                     module: 'functest.core.singlevm'
                     class: 'SingleVm1'
@@ -114,9 +95,6 @@ tiers:
                     It creates new user/project before creating and configuring
                     all tenant network ressources and vms required by advanced
                     testcases.
-                dependencies:
-                    installer: ''
-                    scenario: ''
                 run:
                     module: 'functest.core.singlevm'
                     class: 'SingleVm2'
@@ -130,9 +108,6 @@ tiers:
                     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: '^((?!lxd).)*$'
                 run:
                     module: 'functest.opnfv_tests.openstack.vping.vping_ssh'
                     class: 'VPingSSH'
@@ -145,9 +120,6 @@ tiers:
                 description: >-
                     This test case verifies:  1) Boot a VM with given userdata.
                     2) Connectivity between 2 instances over a private network.
-                dependencies:
-                    installer: ''
-                    scenario: '^((?!lxd).)*$'
                 run:
                     module:
                         'functest.opnfv_tests.openstack.vping.vping_userdata'
@@ -163,9 +135,6 @@ tiers:
                     instance; 2) Write data on volume 3) Detach volume
                     from instance 1, attach it on instance 2 3) Read volume
                     data
-                dependencies:
-                    installer: ''
-                    scenario: '^((?!lxd).)*$'
                 run:
                     module: 'functest.opnfv_tests.openstack.cinder.cinder_test'
                     class: 'CinderCheck'
@@ -180,8 +149,7 @@ tiers:
                     integrates some test suites from upstream using
                     Robot as the test framework.
                 dependencies:
-                    installer: ''
-                    scenario: 'odl'
+                    - DEPLOY_SCENARIO: 'odl'
                 run:
                     module: 'functest.opnfv_tests.sdn.odl.odl'
                     class: 'ODLTests'
@@ -202,8 +170,7 @@ tiers:
                     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.api_check'
                     class: 'ApiCheck'
@@ -219,8 +186,7 @@ tiers:
                     and Cirros VM instance and observes the console output to
                     validate the single port obtains the correct IP address.
                 dependencies:
-                    installer: ''
-                    scenario: '^((?!lxd).)*$'
+                    - DEPLOY_SCENARIO: '^((?!lxd).)*$'
                 run:
                     module: 'functest.opnfv_tests.openstack.snaps.health_check'
                     class: 'HealthCheck'
-- 
cgit 1.2.3-korg