aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorJingLu5 <lvjing5@huawei.com>2017-04-22 02:28:44 +0000
committerKubi <jean.gaoliang@huawei.com>2017-04-25 12:49:32 +0000
commit48d8c77c4989301847c70fba6fa589fb0316e05f (patch)
treee726fd117bd9c5b67270c9809113e677fa8944e3 /docs
parent7d08b884344651d9ba3dd2830dcd976d2adba9f5 (diff)
Update virtualenv installation step in userguide
Change-Id: I0b3e8f22b6878c3b2cf1a54f3c39f2888406c508 Signed-off-by: JingLu5 <lvjing5@huawei.com> (cherry picked from commit f6e13de54c5b71f9112c38b12f6c327af743d68a)
Diffstat (limited to 'docs')
-rw-r--r--docs/testing/user/userguide/04-installation.rst20
1 files changed, 19 insertions, 1 deletions
diff --git a/docs/testing/user/userguide/04-installation.rst b/docs/testing/user/userguide/04-installation.rst
index c1325cab5..0c2bb58cf 100644
--- a/docs/testing/user/userguide/04-installation.rst
+++ b/docs/testing/user/userguide/04-installation.rst
@@ -63,6 +63,10 @@ Prepare the Yardstick container
.. _dockerhub: https://hub.docker.com/r/opnfv/yardstick/
+Install docker on your guest system with the following command, if not done yet::
+
+ wget -qO- https://get.docker.com/ | sh
+
Pull the Yardstick Docker image (``opnfv/yardstick``) from the public dockerhub
registry under the OPNFV account: dockerhub_, with the following docker
command::
@@ -146,6 +150,12 @@ In the Yardstick container, the Yardstick repository is located in the ``/home/o
yardstick env prepare
**NOTE**: The above command just works for four OPNFV installers -- **Apex**, **Compass**, **Fuel** and **Joid**.
+The env prepare command may take up to 6-8 minutes to finish building
+yardstick-image and other environment preparation. Meanwhile if you wish to
+monitor the env prepare process, you can enter the Yardstick container in a new
+terminal window and execute the following command::
+
+ tail -f /var/log/yardstick/uwsgi.log
The second way
@@ -267,14 +277,23 @@ Docker image from Docker hub::
Install Yardstick
^^^^^^^^^^^^^^^^^^^^^
+Prerequisite preparation::
+
+ apt-get update && apt-get install -y git python-setuptools python-pip
+ easy_install -U setuptools==30.0.0
+ pip install appdirs==1.4.0
+ pip install virtualenv
+
Create a virtual environment::
virtualenv ~/yardstick_venv
+ export YARDSTICK_VENV=~/yardstick_venv
source ~/yardstick_venv/bin/activate
Download the source code and install Yardstick from it::
git clone https://gerrit.opnfv.org/gerrit/yardstick
+ export YARDSTICK_REPO_DIR=~/yardstick
cd yardstick
./install.sh
@@ -487,4 +506,3 @@ yaml file and add test cases, constraint or task arguments if necessary.
Proxy Support (**Todo**)
---------------------------
-