aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinda Wang <wangwulin@huawei.com>2017-11-17 03:38:41 +0000
committerCédric Ollivier <cedric.ollivier@orange.com>2017-11-20 09:09:39 +0100
commit06421562d075f6e9d12a0b43e1dce1982b035d59 (patch)
treef5c68cb0730b848470ffa06d81a31ae959e7322c
parentd45f54a5ea6a2279f42dd4334035a1f9cdfba75e (diff)
Update documentation for Functest
1. Remove the reference of ubuntu based container 2. Remove the domino (terminated) and promise (not in F), and move fds to features tier Conflicts: functest/docs/testing/user/userguide/test_overview.rst Change-Id: I62af47a3f873f0a77d5f7e0a1df493651c805834 Signed-off-by: Linda Wang <wangwulin@huawei.com>
-rw-r--r--docs/testing/developer/devguide/index.rst8
-rw-r--r--docs/testing/user/configguide/ci.rst1
-rw-r--r--docs/testing/user/configguide/configguide.rst9
3 files changed, 1 insertions, 17 deletions
diff --git a/docs/testing/developer/devguide/index.rst b/docs/testing/developer/devguide/index.rst
index d03a10e28..12325c66c 100644
--- a/docs/testing/developer/devguide/index.rst
+++ b/docs/testing/developer/devguide/index.rst
@@ -47,11 +47,6 @@ Functest High level architecture
Functest is a project delivering test containers dedicated to OPNFV.
It includes the tools, the scripts and the test scenarios.
-Until Danube, Functest produced 2 docker files based on Ubuntu 14.04:
-
- * x86 Functest: https://hub.docker.com/r/opnfv/functest/
- * aarch64 Functest: https://hub.docker.com/r/opnfv/functest_aarch64/
-
In Euphrates Alpine containers have been introduced in order to lighten the
container and manage testing slicing. The new containers are created according
to the different tiers:
@@ -95,8 +90,7 @@ The internal test cases in Euphrates are:
* vping_ssh
* vping_userdata
* odl
- * odl-netvirt
- * odl-fds
+ * odl_netvirt
* rally_full
* rally_sanity
* tempest_smoke_serial
diff --git a/docs/testing/user/configguide/ci.rst b/docs/testing/user/configguide/ci.rst
index ada803c58..f3901d867 100644
--- a/docs/testing/user/configguide/ci.rst
+++ b/docs/testing/user/configguide/ci.rst
@@ -5,7 +5,6 @@ container from Jenkins.
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
diff --git a/docs/testing/user/configguide/configguide.rst b/docs/testing/user/configguide/configguide.rst
index b82376dbd..7da7285ed 100644
--- a/docs/testing/user/configguide/configguide.rst
+++ b/docs/testing/user/configguide/configguide.rst
@@ -9,8 +9,6 @@ Alpine allows Functest testing in several very light containers and thanks to
the refactoring on dependency management should allow the creation of light and
fully customized docker images.
-It is still possible to use the monolithic Ubuntu image opnfv/functest especially
-for tests on Aarch64 architecture.
Functest Dockers
----------------
@@ -362,12 +360,8 @@ The structure of functest repo can be described as follows::
|-- build.sh
|-- commons
|-- docker
- | |-- Dockerfile
- | |-- Dockerfile.aarch64.patch
| |-- components
- | |-- config_install_env.sh
| |-- core
- | |-- docker_remote_api
| |-- features
| |-- healthcheck
| |-- smoke
@@ -413,7 +407,6 @@ The structure of functest repo can be described as follows::
│   |-- config_functest.yaml
│   |-- config_patch.yaml
│   |-- download_images.sh
- │   |-- installer_params.yaml
│   |-- logging.ini
│   |-- prepare_env.py
│   |-- rally_aarch64_patch.conf
@@ -735,9 +728,7 @@ work with the above pre-requisite actions.
.. _`[4]`: http://docs.opnfv.org/en/latest/submodules/functest/docs/testing/user/configguide/index.html
.. _`dockerdocs`: https://docs.docker.com/
-.. _`dockerhub`: https://hub.docker.com/r/opnfv/functest/
.. _`Proxy`: https://docs.docker.com/engine/admin/systemd/#http-proxy
-.. _`FunctestDockerTags`: https://hub.docker.com/r/opnfv/functest/tags/
.. _`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` http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img