Update README to Yoga

Change-Id: I7d97bf1e403c4398dc14d5621cab79e05a166876
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/README.md b/README.md
index 38ac180..8dabe29 100644 (file)
--- a/README.md
+++ b/README.md
@@ -21,7 +21,9 @@ datacenters as the lowest cost (50 euros hardware and software included).
 | Kali              | Ussuri             |
 | Leguer            | Victoria           |
 | Wallaby           | Wallaby            |
-| **Master**        | **next Xena**      |
+| Xena              | Xena               |
+| **Yoga**          | **Yoga**           |
+| Master            | next Zed           |
 
 ## Prepare your environment
 
@@ -49,7 +51,7 @@ export OS_IDENTITY_API_VERSION=3
 export OS_REGION_NAME=XXX
 ```
 
-mkdir -p images && wget -q -O- https://git.opnfv.org/functest/plain/functest/ci/download_images.sh | sh -s -- images && ls -1 images/*
+mkdir -p images && wget -q -O- https://git.opnfv.org/functest/plain/functest/ci/download_images.sh?h=stable/yoga | sh -s -- images && ls -1 images/*
 ```
 images/cirros-0.5.1-aarch64-disk.img
 images/cirros-0.5.1-x86_64-disk.img
@@ -68,7 +70,7 @@ images/vyos-1.1.8-amd64.qcow2
 sudo docker run --env-file env \
     -v $(pwd)/openstack.creds:/home/opnfv/functest/conf/env_file \
     -v $(pwd)/images:/home/opnfv/functest/images \
-    opnfv/functest-healthcheck
+    opnfv/functest-healthcheck:yoga
 ```
 
 ```
@@ -96,7 +98,7 @@ sudo docker run --env-file env \
 sudo docker run --env-file env \
     -v $(pwd)/openstack.creds:/home/opnfv/functest/conf/env_file \
     -v $(pwd)/images:/home/opnfv/functest/images \
-    opnfv/functest-smoke
+    opnfv/functest-smoke:yoga
 ```
 
 ```
@@ -130,7 +132,7 @@ sudo docker run --env-file env \
 sudo docker run --env-file env \
     -v $(pwd)/openstack.creds:/home/opnfv/functest/conf/env_file \
     -v $(pwd)/images:/home/opnfv/functest/images \
-    opnfv/functest-smoke-cntt
+    opnfv/functest-smoke-cntt:yoga
 ```
 
 ```
@@ -154,7 +156,7 @@ sudo docker run --env-file env \
 sudo docker run --env-file env \
     -v $(pwd)/openstack.creds:/home/opnfv/functest/conf/env_file \
     -v $(pwd)/images:/home/opnfv/functest/images \
-    opnfv/functest-benchmarking
+    opnfv/functest-benchmarking:yoga
 ```
 
 ```
@@ -174,7 +176,7 @@ sudo docker run --env-file env \
 sudo docker run --env-file env \
     -v $(pwd)/openstack.creds:/home/opnfv/functest/conf/env_file \
     -v $(pwd)/images:/home/opnfv/functest/images \
-    opnfv/functest-benchmarking-cntt
+    opnfv/functest-benchmarking-cntt:yoga
 ```
 
 ```
@@ -194,7 +196,7 @@ sudo docker run --env-file env \
 sudo docker run --env-file env \
     -v $(pwd)/openstack.creds:/home/opnfv/functest/conf/env_file \
     -v $(pwd)/images:/home/opnfv/functest/images \
-    opnfv/functest-vnf
+    opnfv/functest-vnf:yoga
 ```
 
 ```

diff --git a/docs/testing/user/configguide/configguide.rst b/docs/testing/user/configguide/configguide.rst
index b1727a2..24c297c 100644 (file)
--- a/docs/testing/user/configguide/configguide.rst
+++ b/docs/testing/user/configguide/configguide.rst
@@ -51,7 +51,7 @@ See section on OpenStack credentials for details.
 
 Create a directory for the different images (attached as a Docker volume)::
 
-  mkdir -p images && wget -q -O- https://git.opnfv.org/functest/plain/functest/ci/download_images.sh | sh -s -- images && ls -1 images/*
+  mkdir -p images && wget -q -O- https://git.opnfv.org/functest/plain/functest/ci/download_images.sh?h=stable/yoga | sh -s -- images && ls -1 images/*
 
   images/cirros-0.5.1-aarch64-disk.img
   images/cirros-0.5.1-x86_64-disk.img