From 5504724dc69096b36948de9bd07b82f5058242f0 Mon Sep 17 00:00:00 2001
From: Morgan Richomme <morgan.richomme@orange.com>
Date: Tue, 12 Sep 2017 11:39:11 +0200
Subject: Update Functest documentation for Euphrates

- Better description of Alpine docker (default artifact)
- Reorganization of config and user guide
- Upgrade of the developer guide

Change-Id: Ie8e10f027bfcdb01c992cd161a1af2d6d6e29536
Signed-off-by: Morgan Richomme <morgan.richomme@orange.com>
---
 docs/testing/user/configguide/ci.rst | 50 +++++-------------------------------
 1 file changed, 7 insertions(+), 43 deletions(-)

(limited to 'docs/testing/user/configguide/ci.rst')

diff --git a/docs/testing/user/configguide/ci.rst b/docs/testing/user/configguide/ci.rst
index 384bc34e..ada803c5 100644
--- a/docs/testing/user/configguide/ci.rst
+++ b/docs/testing/user/configguide/ci.rst
@@ -1,50 +1,14 @@
 Integration in CI
 =================
-In CI we use the Docker image and execute the appropriate commands within the
+In CI we use the Docker images and execute the appropriate commands within the
 container from Jenkins.
 
-Docker creation in set-functest-env builder `[3]`_::
-
-    envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} -e NODE_NAME=${NODE_NAME}"
-    [...]
-    docker pull opnfv/functest:$DOCKER_TAG >/dev/null
-    cmd="sudo docker run -id ${envs} ${volumes} ${custom_params} ${TESTCASE_OPTIONS} opnfv/functest:${DOCKER_TAG} /bin/bash"
-    echo "Functest: Running docker run command: ${cmd}"
-    ${cmd} >${redirect}
-    sleep 5
-    container_id=$(docker ps | grep "opnfv/functest:${DOCKER_TAG}" | awk '{print $1}' | head -1)
-    echo "Container ID=${container_id}"
-    if [ -z ${container_id} ]; then
-        echo "Cannot find opnfv/functest container ID ${container_id}. Please check if it is existing."
-        docker ps -a
-        exit 1
-    fi
-    echo "Starting the container: docker start ${container_id}"
-    docker start ${container_id}
-    sleep 5
-    docker ps >${redirect}
-    if [ $(docker ps | grep "opnfv/functest:${DOCKER_TAG}" | wc -l) == 0 ]; then
-        echo "The container opnfv/functest with ID=${container_id} has not been properly started. Exiting..."
-        exit 1
-    fi
-
-    cmd="python ${FUNCTEST_REPO_DIR}/functest/ci/prepare_env.py start"
-    echo "Executing command inside the docker: ${cmd}"
-    docker exec ${container_id} ${cmd}
-
-
-Test execution in functest-all builder `[3]`_::
-
-    branch=${GIT_BRANCH##*/}
-    echo "Functest: run $FUNCTEST_SUITE_NAME on branch ${branch}"
-    cmd="functest testcase run $FUNCTEST_SUITE_NAME"
-    fi
-    container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
-    docker exec $container_id $cmd
-    ret_value=$?
-    exit $ret_value
-
-Docker clean in functest-cleanup builder `[3]`_ calling docker rm and docker rmi
+4 steps have been defined::
+  * functest-cleanup: clean existing functest dockers on the jumphost
+  * set-functest-env-alpine: prepare en environement files
+  * functest-daily: run dockers opnfv/functest-* (healthcheck, smoke, features, vnf)
+  * functest-store-results: push logs to artifacts
 
+See `[3]`_ for details.
 
 .. _`[3]`: https://git.opnfv.org/releng/tree/jjb/functest/functest-daily-jobs.yml
-- 
cgit 1.2.3-korg