Update K8s test case results in doc

Change-Id: I655629f539af63deccd6a9c6ad1fb7600f4bde60
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 5b1a05cdea1d7e0a3c9e6bd8f81473f4be845b39)

4 files changed, 95 insertions, 7 deletions

diff --git a/docs/release/release-notes/functest-release.rst b/docs/release/release-notes/functest-release.rst
index ae82ae978..d6812bc5b 100644
--- a/docs/release/release-notes/functest-release.rst
+++ b/docs/release/release-notes/functest-release.rst
@@ -66,8 +66,12 @@ Kubernetes
 The internal test cases are:
 
  * k8s_smoke
- * xrally_kubernetes
  * k8s_conformance
+ * xrally_kubernetes
+ * kube_hunter
+ * kube_bench
+ * xrally_kubernetes_full
+ * k8s_vims
 
 Release Data
 ============
@@ -97,6 +101,9 @@ Software
 
  * https://hub.docker.com/r/opnfv/functest-kubernetes-healthcheck
  * https://hub.docker.com/r/opnfv/functest-kubernetes-smoke
+ * https://hub.docker.com/r/opnfv/functest-kubernetes-security
+ * https://hub.docker.com/r/opnfv/functest-kubernetes-benchmarking
+ * https://hub.docker.com/r/opnfv/functest-kubernetes-cnf
 
 Docker tag for jerma: jerma
 
diff --git a/docs/spelling_wordlist.txt b/docs/spelling_wordlist.txt
index 7d05f482e..0f82082d3 100644
--- a/docs/spelling_wordlist.txt
+++ b/docs/spelling_wordlist.txt
@@ -15,6 +15,8 @@ cntt
 Clearwater
 cloudify
 Cloudify
+cnf
+cntt
 conf
 config
 dashboarding
@@ -130,6 +132,7 @@ vEPC
 verifier
 versioned
 vIMS
+vims
 Virtualised
 Virtualized
 vm
diff --git a/docs/testing/user/configguide/configguide.rst b/docs/testing/user/configguide/configguide.rst
index 26865d001..7caf31692 100644
--- a/docs/testing/user/configguide/configguide.rst
+++ b/docs/testing/user/configguide/configguide.rst
@@ -13,7 +13,6 @@ Functest Dockers for OpenStack deployment
 -----------------------------------------
 Docker images are available on the dockerhub:
 
-  * opnfv/functest-core
   * opnfv/functest-healthcheck
   * opnfv/functest-smoke
   * opnfv/functest-smoke-cntt
@@ -233,9 +232,11 @@ Functest Dockers for Kubernetes deployment
 ------------------------------------------
 Docker images are available on the dockerhub:
 
-  * opnfv/functest-kubernetes-core
   * opnfv/functest-kubernetes-healthcheck
   * opnfv/functest-kubernetes-smoke
+  * opnfv/functest-kubernetes-security
+  * opnfv/functest-kubernetes-benchmarking
+  * opnfv/functest-kubernetes-cnf
 
 Preparing your environment
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -278,10 +279,62 @@ Results shall be displayed as follows::
   +---------------------------+------------------+---------------+------------------+----------------+
   |         TEST CASE         |     PROJECT      |      TIER     |     DURATION     |     RESULT     |
   +---------------------------+------------------+---------------+------------------+----------------+
-  |     xrally_kubernetes     |     functest     |     smoke     |      16:12       |      PASS      |
-  |      k8s_conformance      |     functest     |     smoke     |      149:59      |      PASS      |
+  |      k8s_conformance      |     functest     |     smoke     |      68:21       |      PASS      |
+  |     xrally_kubernetes     |     functest     |     smoke     |      13:40       |      PASS      |
   +---------------------------+------------------+---------------+------------------+----------------+
 
+Testing security suite
+^^^^^^^^^^^^^^^^^^^^^^
+
+Run smoke suite::
+
+  sudo docker run -it --env-file env \
+      -v $(pwd)/config:/root/.kube/config \
+      opnfv/functest-kubernetes-security:jerma
+
+Results shall be displayed as follows::
+
+  +---------------------+------------------+------------------+------------------+----------------+
+  |      TEST CASE      |     PROJECT      |       TIER       |     DURATION     |     RESULT     |
+  +---------------------+------------------+------------------+------------------+----------------+
+  |     kube_hunter     |     functest     |     security     |      00:19       |      PASS      |
+  |      kube_bench     |     functest     |     security     |      00:01       |      PASS      |
+  +---------------------+------------------+------------------+------------------+----------------+
+
+Testing benchmarking suite
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Run benchmarking suite::
+
+  sudo docker run -it --env-file env \
+      -v $(pwd)/config:/root/.kube/config \
+      opnfv/functest-kubernetes-benchmarking:jerma
+
+Results shall be displayed as follows::
+
+  +--------------------------------+------------------+----------------------+------------------+----------------+
+  |           TEST CASE            |     PROJECT      |         TIER         |     DURATION     |     RESULT     |
+  +--------------------------------+------------------+----------------------+------------------+----------------+
+  |     xrally_kubernetes_full     |     functest     |     benchmarking     |      34:58       |      PASS      |
+  +--------------------------------+------------------+----------------------+------------------+----------------+
+
+Testing cnf suite
+^^^^^^^^^^^^^^^^^
+
+Run cnf suite::
+
+  sudo docker run -it --env-file env \
+      -v $(pwd)/config:/root/.kube/config \
+      opnfv/functest-kubernetes-cnf:jerma
+
+Results shall be displayed as follows::
+
+  +-------------------+------------------+--------------+------------------+----------------+
+  |     TEST CASE     |     PROJECT      |     TIER     |     DURATION     |     RESULT     |
+  +-------------------+------------------+--------------+------------------+----------------+
+  |      k8s_vims     |     functest     |     cnf      |      20:32       |      PASS      |
+  +-------------------+------------------+--------------+------------------+----------------+
+
 Environment variables
 =====================
 
diff --git a/docs/testing/user/userguide/test_results.rst b/docs/testing/user/userguide/test_results.rst
index 4b1f20a55..2c1fb8544 100644
--- a/docs/testing/user/userguide/test_results.rst
+++ b/docs/testing/user/userguide/test_results.rst
@@ -122,10 +122,35 @@ Kubernetes smoke suite::
   +---------------------------+------------------+---------------+------------------+----------------+
   |         TEST CASE         |     PROJECT      |      TIER     |     DURATION     |     RESULT     |
   +---------------------------+------------------+---------------+------------------+----------------+
-  |     xrally_kubernetes     |     functest     |     smoke     |      16:12       |      PASS      |
-  |      k8s_conformance      |     functest     |     smoke     |      149:59      |      PASS      |
+  |      k8s_conformance      |     functest     |     smoke     |      68:21       |      PASS      |
+  |     xrally_kubernetes     |     functest     |     smoke     |      13:40       |      PASS      |
   +---------------------------+------------------+---------------+------------------+----------------+
 
+Kubernetes security suite::
+
+  +---------------------+------------------+------------------+------------------+----------------+
+  |      TEST CASE      |     PROJECT      |       TIER       |     DURATION     |     RESULT     |
+  +---------------------+------------------+------------------+------------------+----------------+
+  |     kube_hunter     |     functest     |     security     |      00:19       |      PASS      |
+  |      kube_bench     |     functest     |     security     |      00:01       |      PASS      |
+  +---------------------+------------------+------------------+------------------+----------------+
+
+Kubernetes benchmarking suite::
+
+  +--------------------------------+------------------+----------------------+------------------+----------------+
+  |           TEST CASE            |     PROJECT      |         TIER         |     DURATION     |     RESULT     |
+  +--------------------------------+------------------+----------------------+------------------+----------------+
+  |     xrally_kubernetes_full     |     functest     |     benchmarking     |      34:58       |      PASS      |
+  +--------------------------------+------------------+----------------------+------------------+----------------+
+
+Kubernetes cnf suite::
+
+  +-------------------+------------------+--------------+------------------+----------------+
+  |     TEST CASE     |     PROJECT      |     TIER     |     DURATION     |     RESULT     |
+  +-------------------+------------------+--------------+------------------+----------------+
+  |      k8s_vims     |     functest     |     cnf      |      20:32       |      PASS      |
+  +-------------------+------------------+--------------+------------------+----------------+
+
 Results are automatically pushed to the test results database, some additional
 result files are pushed to OPNFV artifact web sites.