X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docs%2Ftesting%2Fuser%2Fconfigguide%2Fconfigguide.rst;h=a6cc7b449ab28e69917496f76d4ab9fae96fabb0;hb=5b1a05cdea1d7e0a3c9e6bd8f81473f4be845b39;hp=75af1bb520c371b8ca13ba0810dcd3d382ce140a;hpb=139fb4ff923558e77d0a0836ba1870958c27941e;p=functest.git

diff --git a/docs/testing/user/configguide/configguide.rst b/docs/testing/user/configguide/configguide.rst
index 75af1bb52..a6cc7b449 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
@@ -55,8 +54,8 @@ Create a directory for the different images (attached as a Docker volume)::
 
   mkdir -p images && wget -q -O- https://git.opnfv.org/functest/plain/functest/ci/download_images.sh | bash -s -- images && ls -1 images/*
 
-  images/cirros-0.4.0-aarch64-disk.img
-  images/cirros-0.4.0-x86_64-disk.img
+  images/cirros-0.5.1-aarch64-disk.img
+  images/cirros-0.5.1-x86_64-disk.img
   images/cloudify-docker-manager-community-19.01.24.tar
   images/Fedora-Cloud-Base-30-1.2.x86_64.qcow2
   images/shaker-image-1.3.0+stretch.qcow2
@@ -228,9 +227,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
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -273,10 +274,62 @@ Results shall be displayed as follows::
   +---------------------------+------------------+---------------+------------------+----------------+
   |         TEST CASE         |     PROJECT      |      TIER     |     DURATION     |     RESULT     |
   +---------------------------+------------------+---------------+------------------+----------------+
-  |     xrally_kubernetes     |     functest     |     smoke     |      22:04       |      PASS      |
-  |      k8s_conformance      |     functest     |     smoke     |      173:48      |      PASS      |
+  |      k8s_conformance      |     functest     |     smoke     |      94:26       |      PASS      |
+  |     xrally_kubernetes     |     functest     |     smoke     |      13:05       |      PASS      |
   +---------------------------+------------------+---------------+------------------+----------------+
 
+Testing security suite
+^^^^^^^^^^^^^^^^^^^^^^
+
+Run smoke suite::
+
+  sudo docker run -it --env-file env \
+      -v $(pwd)/config:/root/.kube/config \
+      opnfv/functest-kubernetes-security
+
+Results shall be displayed as follows::
+
+  +---------------------+------------------+------------------+------------------+----------------+
+  |      TEST CASE      |     PROJECT      |       TIER       |     DURATION     |     RESULT     |
+  +---------------------+------------------+------------------+------------------+----------------+
+  |     kube_hunter     |     functest     |     security     |      00:24       |      PASS      |
+  |      kube_bench     |     functest     |     security     |      00:18       |      PASS      |
+  +---------------------+------------------+------------------+------------------+----------------+
+
+Testing benchmarking suite
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Run benchmarking suite::
+
+  sudo docker run -it --env-file env \
+      -v $(pwd)/config:/root/.kube/config \
+      opnfv/functest-kubernetes-benchmarking
+
+Results shall be displayed as follows::
+
+  +--------------------------------+------------------+----------------------+------------------+----------------+
+  |           TEST CASE            |     PROJECT      |         TIER         |     DURATION     |     RESULT     |
+  +--------------------------------+------------------+----------------------+------------------+----------------+
+  |     xrally_kubernetes_full     |     functest     |     benchmarking     |      34:16       |      PASS      |
+  +--------------------------------+------------------+----------------------+------------------+----------------+
+
+Testing cnf suite
+^^^^^^^^^^^^^^^^^
+
+Run cnf suite::
+
+  sudo docker run -it --env-file env \
+      -v $(pwd)/config:/root/.kube/config \
+      opnfv/functest-kubernetes-cnf
+
+Results shall be displayed as follows::
+
+  +-------------------+------------------+--------------+------------------+----------------+
+  |     TEST CASE     |     PROJECT      |     TIER     |     DURATION     |     RESULT     |
+  +-------------------+------------------+--------------+------------------+----------------+
+  |      k8s_vims     |     functest     |     cnf      |      19:12       |      PASS      |
+  +-------------------+------------------+--------------+------------------+----------------+
+
 Environment variables
 =====================
 
@@ -628,5 +681,5 @@ work with the above pre-requisite actions.
 .. _`Install Docker on CentOS`: https://docs.docker.com/engine/installation/linux/centos/
 .. _`Functest User Guide`: http://docs.opnfv.org/en/stable-danube/submodules/functest/docs/testing/user/userguide/index.html
 .. _`images/CentOS-7-x86_64-GenericCloud.qcow2`: https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud.qcow2
-.. _`images/cirros-0.4.0-x86_64-disk.img`: http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img
+.. _`images/cirros-0.5.1-x86_64-disk.img`: http://download.cirros-cloud.net/0.5.1/cirros-0.5.1-x86_64-disk.img
 .. _`images/ubuntu-14.04-server-cloudimg-amd64-disk1.img`: https://cloud-images.ubuntu.com/releases/14.04/release/ubuntu-14.04-server-cloudimg-amd64-disk1.img