Merge "Tag dovetail with cvp.0.4.0"

5 files changed, 20 insertions, 13 deletions

diff --git a/docs/testing/user/userguide/testing_guide.rst b/docs/testing/user/userguide/testing_guide.rst
index 9e46b561..a888be30 100644
--- a/docs/testing/user/userguide/testing_guide.rst
+++ b/docs/testing/user/userguide/testing_guide.rst
@@ -261,8 +261,8 @@ If the Test Host is online, you can directly pull.
 
 .. code-block:: bash
 
-   $ sudo docker pull opnfv/dovetail:cvp.0.3.0
-   cvp.0.3.0: Pulling from opnfv/dovetail
+   $ sudo docker pull opnfv/dovetail:cvp.0.4.0
+   cvp.0.4.0: Pulling from opnfv/dovetail
    30d541b48fc0: Pull complete
    8ecd7f80d390: Pull complete
    46ec9927bb81: Pull complete
@@ -275,9 +275,9 @@ If the Test Host is online, you can directly pull.
    bf7c644692de: Pull complete
    cdc345e3f363: Pull complete
    Digest: sha256:d571b1073b2fdada79562e8cc67f63018e8d89268ff7faabee3380202c05edee
-   Status: Downloaded newer image for opnfv/dovetail:cvp.0.3.0
+   Status: Downloaded newer image for opnfv/dovetail:cvp.0.4.0
 
-An example of the <tag> is *cvp.0.3.0*.
+An example of the <tag> is *cvp.0.4.0*.
 
 If the Test Host is offline, you will need to first pull the Dovetail Docker image, and all the
 dependent images that Dovetail uses, to a host that is online. The reason that you need
@@ -287,9 +287,10 @@ offline, then all these dependencies will also need to be manually copied.
 
 .. code-block:: bash
 
-   $ sudo docker pull opnfv/dovetail:cvp.0.3.0
+   $ sudo docker pull opnfv/dovetail:cvp.0.4.0
    $ sudo docker pull opnfv/functest:cvp.0.2.0
    $ sudo docker pull opnfv/yardstick:danube.3.1
+   $ sudo docker pull opnfv/bottlenecks:cvp.0.4.0
    $ sudo wget -nc http://artifacts.opnfv.org/sdnvpn/ubuntu-16.04-server-cloudimg-amd64-disk1.img -P {ANY_DIR}
 
 Once all these images are pulled, save the images, copy to the Test Host, and then load
@@ -299,7 +300,8 @@ At the online host, save images.
 
 .. code-block:: bash
 
-   $ sudo docker save -o dovetail.tar opnfv/dovetail:cvp.0.3.0 opnfv/functest:cvp.0.2.0 opnfv/yardstick:danube.3.1
+   $ sudo docker save -o dovetail.tar opnfv/dovetail:cvp.0.4.0 opnfv/functest:cvp.0.2.0 \
+     opnfv/yardstick:danube.3.1 opnfv/bottlenecks:cvp.0.4.0
 
 Copy dovetail.tar file to the Test Host, and then load the images on the Test Host.
 
@@ -316,8 +318,9 @@ Now check to see that the Dovetail image has been pulled or loaded properly.
    $ sudo docker images
    REPOSITORY          TAG                 IMAGE ID            CREATED             SIZE
    opnfv/functest      cvp.0.2.0           9eaeaea5f203        8 days ago          1.53GB
-   opnfv/dovetail      cvp.0.3.0           5d25b289451c        8 days ago          516MB
+   opnfv/dovetail      cvp.0.4.0           5d25b289451c        8 days ago          516MB
    opnfv/yardstick     danube.3.1          574596b6ea12        8 days ago          1.2GB
+   opnfv/bottlenecks   cvp.0.4.0           00450688bcae        3 hours ago         622 MB
 
 Regardless of whether you pulled down the Dovetail image directly online, or loaded from
 a static image tar file, you are ready to run Dovetail.
diff --git a/dovetail/utils/local_db/launch_db.sh b/dovetail/utils/local_db/launch_db.sh
index 722dc227..38a97331 100755
--- a/dovetail/utils/local_db/launch_db.sh
+++ b/dovetail/utils/local_db/launch_db.sh
@@ -59,8 +59,8 @@ echo "Create the testapi service."
 echo "=========================="
 
 set +e
-# pull image opnfv/testapi:cvp.0.3.0
-testapi_img="opnfv/testapi:cvp.0.3.0"
+# pull image opnfv/testapi:cvp.0.4.0
+testapi_img="opnfv/testapi:cvp.0.4.0"
 echo "Step1: pull the image $testapi_img."
 sudo docker pull $testapi_img
 set -e
diff --git a/dovetail/utils/local_db/restart_db.sh b/dovetail/utils/local_db/restart_db.sh
index 35096b99..668b4b84 100755
--- a/dovetail/utils/local_db/restart_db.sh
+++ b/dovetail/utils/local_db/restart_db.sh
@@ -26,4 +26,4 @@ export db_host_ip=${db_host_ip:-"$1"}
 
 sudo docker rm -f testapi
 sudo docker run -itd -p $testapi_port:8000 --name testapi \
-    -e mongodb_url=mongodb://$db_host_ip:$mongodb_port/ opnfv/testapi:cvp.0.3.0
+    -e mongodb_url=mongodb://$db_host_ip:$mongodb_port/ opnfv/testapi:cvp.0.4.0
diff --git a/dovetail/utils/offline/config.yaml b/dovetail/utils/offline/config.yaml
index 11134dd1..bebd6f4a 100644
--- a/dovetail/utils/offline/config.yaml
+++ b/dovetail/utils/offline/config.yaml
@@ -2,7 +2,7 @@
 docker_images:
   dovetail:
     domain: opnfv
-    tag: cvp.0.3.0
+    tag: cvp.0.4.0
     store_name: image_dovetail.docker
   functest:
     domain: opnfv
@@ -12,9 +12,13 @@ docker_images:
     domain: opnfv
     tag: danube.3.1
     store_name: image_yardstick.docker
+  bottlenecks:
+    domain: opnfv
+    tag: cvp.0.4.0
+    store_name: image_bottlenecks.docker
   testapi:
     domain: opnfv
-    tag: cvp.0.3.0
+    tag: cvp.0.4.0
     store_name: image_testapi.docker
   mongo:
     tag: 3.2.1
diff --git a/setup.cfg b/setup.cfg
index 64d35f68..231e9bd7 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = dovetail
-version = 0.3.0
+version = 0.4.0
 home-page = https://wiki.opnfv.org/display/dovetail
 
 [entry_points]