From dd6f8d6f79131b3237608516137c4a36e56c21fe Mon Sep 17 00:00:00 2001
From: QiLiang <liangqi1@huawei.com>
Date: Wed, 28 Mar 2018 17:00:27 +0800
Subject: Add testcase clover_k8s

Clover testcase hook patch:
  https://gerrit.opnfv.org/gerrit/#/c/54541/

This patch is depend on patch:
  https://gerrit.opnfv.org/gerrit/#/c/54695/

Scenario k8-istio-clover run k8s_smoke and clover_k8s

Change-Id: I2cd76ed9d882f94567fd721d250da13b19aaa37b
Signed-off-by: QiLiang <liangqi1@huawei.com>
(cherry picked from commit 9b324efe02cdc1f4bbda85fbbf1225882264f97c)
---
 docker/features/testcases.yaml    | 24 +++++++++++++++++++++++-
 docker/healthcheck/testcases.yaml |  2 +-
 docker/smoke/testcases.yaml       |  4 ++--
 docker/testcases.yaml             | 24 +++++++++++++++++++++++-
 4 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/docker/features/testcases.yaml b/docker/features/testcases.yaml
index 7ea601dc..08d43662 100644
--- a/docker/features/testcases.yaml
+++ b/docker/features/testcases.yaml
@@ -2,7 +2,7 @@
 tiers:
     -
         name: stor4nfv
-        order: 3
+        order: 1
         ci_loop: '(daily)|(weekly)'
         description: >-
             Test suite from Stor4NFV project.
@@ -21,3 +21,25 @@ tiers:
                 run:
                     module: 'stor4nfv_tests.stor4nfv_k8s'
                     class: 'K8sStor4nfvTest'
+
+    -
+        name: clover
+        order: 2
+        ci_loop: '(daily)|(weekly)'
+        description: >-
+            Test suite from Clover project.
+        testcases:
+            -
+                case_name: clover_k8s
+                project_name: clover
+                criteria: 100
+                blocking: false
+                description: >-
+                    This tests are necessary demonstrate features
+                    of K8s+Istio+Clover deployment.
+                dependencies:
+                    installer: 'container4nfv'
+                    scenario: 'clover'
+                run:
+                    module: 'clover.functest.clover_k8s'
+                    class: 'K8sCloverTest'
diff --git a/docker/healthcheck/testcases.yaml b/docker/healthcheck/testcases.yaml
index 5864755e..a5da95ad 100644
--- a/docker/healthcheck/testcases.yaml
+++ b/docker/healthcheck/testcases.yaml
@@ -17,7 +17,7 @@ tiers:
                     validates the deployed cluster is accessible, and
                     at least satisfies minimal functional requirements.
                 dependencies:
-                    installer: '(compass)|(joid)|(kubespray)'
+                    installer: '(compass)|(joid)|(kubespray)|(container4nfv)'
                     scenario: 'k8-*'
                 run:
                     module: 'functest_kubernetes.k8stest'
diff --git a/docker/smoke/testcases.yaml b/docker/smoke/testcases.yaml
index 04a9104b..79508a5b 100644
--- a/docker/smoke/testcases.yaml
+++ b/docker/smoke/testcases.yaml
@@ -2,7 +2,7 @@
 tiers:
     -
         name: smoke
-        order: 2
+        order: 1
         ci_loop: '(merge)|(verify)|(daily)|(weekly)'
         description: >-
             A set of conformance tests integrated from kubernetes project.
@@ -17,7 +17,7 @@ tiers:
                     cluster, this tests are necessary demonstrate conformance
                     of the Kubernetes deployment.
                 dependencies:
-                    installer: '(compass)|(joid)|(kubespray)'
+                    installer: '(compass)|(joid)|(kubespray)|(container4nfv)'
                     scenario: 'k8-*'
                 run:
                     module: 'functest_kubernetes.k8stest'
diff --git a/docker/testcases.yaml b/docker/testcases.yaml
index dadf27c4..7c532555 100644
--- a/docker/testcases.yaml
+++ b/docker/testcases.yaml
@@ -17,7 +17,7 @@ tiers:
                     validates the deployed cluster is accessible, and
                     at least satisfies minimal functional requirements.
                 dependencies:
-                    installer: '(compass)|(joid)|(kubespray)'
+                    installer: '(compass)|(joid)|(kubespray)|(container4nfv)'
                     scenario: 'k8-*'
                 run:
                     module: 'functest_kubernetes.k8stest'
@@ -67,3 +67,25 @@ tiers:
                 run:
                     module: 'stor4nfv_tests.stor4nfv_k8s'
                     class: 'K8sStor4nfvTest'
+
+    -
+        name: clover
+        order: 4
+        ci_loop: '(daily)|(weekly)'
+        description: >-
+            Test suite from Clover project.
+        testcases:
+            -
+                case_name: clover_k8s
+                project_name: clover
+                criteria: 100
+                blocking: false
+                description: >-
+                    This tests are necessary demonstrate features
+                    of K8s+Istio+Clover deployment.
+                dependencies:
+                    installer: 'container4nfv'
+                    scenario: 'clover'
+                run:
+                    module: 'clover.functest.clover_k8s'
+                    class: 'K8sCloverTest'
-- 
cgit 1.2.3-korg