From 49d3a31e4015eb274e68562c6aaf7ab5be2fd1bf Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Sun, 2 Sep 2018 14:55:13 +0200
Subject: Update Xtesting to 0.60
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Xtesting leverages on stevedore [1] which will bring much more
flexibility (discovery, module or class renaming, etc).

OPNFV Features have to be updated as well:
  - https://gerrit.opnfv.org/gerrit/61719
  - https://gerrit.opnfv.org/gerrit/61723

[1] https://docs.openstack.org/stevedore/latest/

Change-Id: Ibe2a6ab3ddca92882aa4a26f140d2db28d77cb86
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
 docker/features/testcases.yaml    | 10 ++++------
 docker/healthcheck/testcases.yaml |  5 ++---
 docker/smoke/testcases.yaml       |  3 +--
 setup.cfg                         |  5 +++++
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/docker/features/testcases.yaml b/docker/features/testcases.yaml
index 926ae0e7..ff44d59e 100644
--- a/docker/features/testcases.yaml
+++ b/docker/features/testcases.yaml
@@ -2,7 +2,7 @@
 tiers:
     -
         name: stor4nfv
-        order: 1
+        order: 2
         ci_loop: '(daily)|(weekly)'
         description: >-
             Test suite from Stor4NFV project.
@@ -18,12 +18,11 @@ tiers:
                 dependencies:
                     - DEPLOY_SCENARIO: 'stor4nfv'
                 run:
-                    module: 'stor4nfv_tests.stor4nfv_k8s'
-                    class: 'K8sStor4nfvTest'
+                    name: stor4nfv_k8s
 
     -
         name: clover
-        order: 2
+        order: 3
         ci_loop: '(daily)|(weekly)'
         description: >-
             Test suite from Clover project.
@@ -39,5 +38,4 @@ tiers:
                 dependencies:
                     - DEPLOY_SCENARIO: 'clover'
                 run:
-                    module: 'clover.functest.clover_k8s'
-                    class: 'K8sCloverTest'
+                    name: clover_k8s
diff --git a/docker/healthcheck/testcases.yaml b/docker/healthcheck/testcases.yaml
index b4f6e584..94e7ecbd 100644
--- a/docker/healthcheck/testcases.yaml
+++ b/docker/healthcheck/testcases.yaml
@@ -2,7 +2,7 @@
 tiers:
     -
         name: healthcheck
-        order: 1
+        order: 0
         ci_loop: '(merge)|(verify)|(daily)|(weekly)'
         description: >-
             A set of e2e tests integrated from kubernetes project.
@@ -19,5 +19,4 @@ tiers:
                 dependencies:
                     - DEPLOY_SCENARIO: 'k8-*'
                 run:
-                    module: 'functest_kubernetes.k8stest'
-                    class: 'K8sSmokeTest'
+                    name: k8s_smoke
diff --git a/docker/smoke/testcases.yaml b/docker/smoke/testcases.yaml
index c8f68bcf..f3446a6c 100644
--- a/docker/smoke/testcases.yaml
+++ b/docker/smoke/testcases.yaml
@@ -19,5 +19,4 @@ tiers:
                 dependencies:
                     - DEPLOY_SCENARIO: 'k8-*'
                 run:
-                    module: 'functest_kubernetes.k8stest'
-                    class: 'K8sConformanceTest'
+                    name: k8s_conformance
diff --git a/setup.cfg b/setup.cfg
index 1215a3b7..46ece6fc 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -5,3 +5,8 @@ home-page = https://wiki.opnfv.org/display/functest
 
 [files]
 packages = functest_kubernetes
+
+[entry_points]
+xtesting.testcase =
+    k8s_smoke = functest_kubernetes.k8stest:K8sSmokeTest
+    k8s_conformance = functest_kubernetes.k8stest:K8sConformanceTest
-- 
cgit 1.2.3-korg