summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2017-12-21 06:33:00 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-12-21 06:33:00 +0000
commit5268d9ee0c42994f0ebc96327db6f8d41ae06fe6 (patch)
tree90c0a701cd68924ecbb559eb49476ae57e615d51
parentf01fdd86ebfcd8c6c9b368968c2e3572f702b27c (diff)
parent4a3f2f5fd7bdb8cce2108432e08e8f5a3b92c241 (diff)
Merge "Precise the right Docker tags" into stable/euphrates
-rw-r--r--docs/testing/user/configguide/configguide.rst10
-rw-r--r--docs/testing/user/userguide/runfunctest.rst4
2 files changed, 7 insertions, 7 deletions
diff --git a/docs/testing/user/configguide/configguide.rst b/docs/testing/user/configguide/configguide.rst
index 7da7285ed..d9e6d53ab 100644
--- a/docs/testing/user/configguide/configguide.rst
+++ b/docs/testing/user/configguide/configguide.rst
@@ -88,7 +88,7 @@ Run healthcheck suite::
sudo docker run --env-file env \
-v $(pwd)/openstack.creds:/home/opnfv/functest/conf/openstack.creds \
-v $(pwd)/images:/home/opnfv/functest/images \
- opnfv/functest-healthcheck
+ opnfv/functest-healthcheck:euphrates
Results shall be displayed as follows::
@@ -109,7 +109,7 @@ Run smoke suite::
sudo docker run --env-file env \
-v $(pwd)/openstack.creds:/home/opnfv/functest/conf/openstack.creds \
-v $(pwd)/images:/home/opnfv/functest/images \
- opnfv/functest-smoke
+ opnfv/functest-smoke:euphrates
Results shall be displayed as follows::
@@ -137,7 +137,7 @@ Run features suite::
sudo docker run --env-file env \
-v $(pwd)/openstack.creds:/home/opnfv/functest/conf/openstack.creds \
-v $(pwd)/images:/home/opnfv/functest/images \
- opnfv/functest-features
+ opnfv/functest-features:euphrates
Results shall be displayed as follows::
@@ -162,7 +162,7 @@ Run components suite::
sudo docker run --env-file env \
-v $(pwd)/openstack.creds:/home/opnfv/functest/conf/openstack.creds \
-v $(pwd)/images:/home/opnfv/functest/images \
- opnfv/functest-components
+ opnfv/functest-components:euphrates
Results shall be displayed as follows::
@@ -181,7 +181,7 @@ Run vnf suite::
sudo docker run --env-file env \
-v $(pwd)/openstack.creds:/home/opnfv/functest/conf/openstack.creds \
-v $(pwd)/images:/home/opnfv/functest/images \
- opnfv/functest-vnf
+ opnfv/functest-vnf:euphrates
Results shall be displayed as follows::
diff --git a/docs/testing/user/userguide/runfunctest.rst b/docs/testing/user/userguide/runfunctest.rst
index db85c18ff..2c7f0759a 100644
--- a/docs/testing/user/userguide/runfunctest.rst
+++ b/docs/testing/user/userguide/runfunctest.rst
@@ -14,7 +14,7 @@ simply run the tiers by typing (e.g. with functest-healthcheck)::
sudo docker run --env-file env \
-v $(pwd)/openstack.creds:/home/opnfv/functest/conf/openstack.creds \
-v $(pwd)/images:/home/opnfv/functest/images \
- opnfv/functest-healthcheck
+ opnfv/functest-healthcheck:euphrates
You should get::
@@ -46,7 +46,7 @@ Considering the healthcheck example, running functest manaully means::
sudo docker run -ti --env-file env \
-v $(pwd)/openstack.creds:/home/opnfv/functest/conf/openstack.creds \
-v $(pwd)/images:/home/opnfv/functest/images \
- opnfv/functest-healthcheck /bin/bash
+ opnfv/functest-healthcheck:euphrates /bin/bash
The docker prompt shall be returned. Then within the docker run the following
commands::