diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/testing/user/userguide/04-installation.rst | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/docs/testing/user/userguide/04-installation.rst b/docs/testing/user/userguide/04-installation.rst index 7ea40eddd..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 @@ -212,9 +222,9 @@ The created image can be added to OpenStack using the ``glance image-create`` or --file /tmp/workspace/yardstick/yardstick-image.img .. _`Cirros 0.3.5`: http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img -.. _`Ubuntu 14.04`: https://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img +.. _`Ubuntu 16.04`: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img -Some Yardstick test cases use a `Cirros 0.3.5`_ image and/or a `Ubuntu 14.04`_ image. Add Cirros and Ubuntu images to OpenStack:: +Some Yardstick test cases use a `Cirros 0.3.5`_ image and/or a `Ubuntu 16.04`_ image. Add Cirros and Ubuntu images to OpenStack:: openstack image create \ --disk-format qcow2 \ @@ -226,7 +236,7 @@ Some Yardstick test cases use a `Cirros 0.3.5`_ image and/or a `Ubuntu 14.04`_ i --disk-format qcow2 \ --container-format bare \ --file $ubuntu_image_file \ - Ubuntu-14.04 + Ubuntu-16.04 The third 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**) --------------------------- - |