Tag dovetail with cvp.0.5.0

JIRA: DOVETAIL-483

1. docker image used
   yardstick: danube.3.2
   functest: cvp.0.5.0
   bottlenecks: cvp.0.4.0
   testapi: cvp.0.5.0
   dovetail: cvp.0.5.0
2. main changes
   Bugfix: wrong command in function 'check_https_enabled'
   Use opnfv/functest:cvp.0.5.0 and do some adaptions in dovetail tool
   Create a tar file for all logs
   Add tempest test cases into proposed_tests
   Fix testapi base_url for public_url
   Add user guide for results operations on web
3. For more information, refer to
   https://wiki.opnfv.org/display/dovetail/Running+history+for+the+dovetail+tool

Change-Id: Iec548b077a704ff68d6b93de3436e109d59371cd
Signed-off-by: xudan <xudan16@huawei.com>

diff --git a/docs/testing/user/userguide/testing_guide.rst b/docs/testing/user/userguide/testing_guide.rst
index 2d45b18..08fd8ac 100644 (file)
--- 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.4.0
-   cvp.0.4.0: Pulling from opnfv/dovetail
+   $ sudo docker pull opnfv/dovetail:cvp.0.5.0
+   cvp.0.5.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.4.0
+   Status: Downloaded newer image for opnfv/dovetail:cvp.0.5.0
 
-An example of the <tag> is *cvp.0.4.0*.
+An example of the <tag> is *cvp.0.5.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,9 @@ offline, then all these dependencies will also need to be manually copied.
 
 .. code-block:: bash
 
-   $ 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/dovetail:cvp.0.5.0
+   $ sudo docker pull opnfv/functest:cvp.0.5.0
+   $ sudo docker pull opnfv/yardstick:danube.3.2
    $ 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}
 
@@ -300,8 +300,8 @@ At the online host, save images.
 
 .. code-block:: bash
 
-   $ 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
+   $ sudo docker save -o dovetail.tar opnfv/dovetail:cvp.0.5.0 opnfv/functest:cvp.0.5.0 \
+     opnfv/yardstick:danube.3.2 opnfv/bottlenecks:cvp.0.4.0
 
 Copy dovetail.tar file to the Test Host, and then load the images on the Test Host.
 
@@ -317,9 +317,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.4.0           5d25b289451c        8 days ago          516MB
-   opnfv/yardstick     danube.3.1          574596b6ea12        8 days ago          1.2GB
+   opnfv/functest      cvp.0.5.0           9eaeaea5f203        8 days ago          1.53GB
+   opnfv/dovetail      cvp.0.5.0           5d25b289451c        8 days ago          516MB
+   opnfv/yardstick     danube.3.2          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

diff --git a/dovetail/conf/cmd_config.yml b/dovetail/conf/cmd_config.yml
index d862a91..58409f2 100644 (file)
--- a/dovetail/conf/cmd_config.yml
+++ b/dovetail/conf/cmd_config.yml
@@ -21,14 +21,14 @@ cli:
           - '-y'
         path:
           - 'yardstick/docker_tag'
-        help: 'Overwrite tag for yardstick docker container (e.g. danube.3.1)'
+        help: 'Overwrite tag for yardstick docker container (e.g. danube.3.2)'
       func_tag:
         flags:
           - '--func_tag'
           - '-f'
         path:
           - 'functest/docker_tag'
-        help: 'Overwrite tag for functest docker container (e.g. cvp.0.2.0)'
+        help: 'Overwrite tag for functest docker container (e.g. cvp.0.5.0)'
       bott_tag:
         flags:
           - '--bott_tag'

diff --git a/dovetail/conf/dovetail_config.yml b/dovetail/conf/dovetail_config.yml
index 20aeec9..738b892 100644 (file)
--- a/dovetail/conf/dovetail_config.yml
+++ b/dovetail/conf/dovetail_config.yml
@@ -86,6 +86,7 @@ validate_input:
     - 'danube.2.0'
     - 'danube.3.0'
     - 'danube.3.1'
+    - 'danube.3.2'
     - 'cvp.0.1.0'
     - 'cvp.0.2.0'
     - 'cvp.0.3.0'

diff --git a/dovetail/conf/yardstick_config.yml b/dovetail/conf/yardstick_config.yml
index fd93d61..62a4abf 100644 (file)
--- a/dovetail/conf/yardstick_config.yml
+++ b/dovetail/conf/yardstick_config.yml
@@ -1,7 +1,7 @@
 ---
 yardstick:
   image_name: opnfv/yardstick
-  docker_tag: danube.3.1
+  docker_tag: danube.3.2
   opts: '-id --privileged=true'
   config:
     dir: '/home/opnfv/userconfig'

diff --git a/dovetail/utils/local_db/launch_db.sh b/dovetail/utils/local_db/launch_db.sh
index a7439b6..4461be0 100755 (executable)
--- a/dovetail/utils/local_db/launch_db.sh
+++ b/dovetail/utils/local_db/launch_db.sh
@@ -62,8 +62,8 @@ echo "Create the testapi service."
 echo "=========================="
 
 set +e
-# pull image opnfv/testapi:cvp.0.4.0
-testapi_img="opnfv/testapi:cvp.0.4.0"
+# pull image opnfv/testapi:cvp.0.5.0
+testapi_img="opnfv/testapi:cvp.0.5.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 668b4b8..e44bc07 100755 (executable)
--- 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.4.0
+    -e mongodb_url=mongodb://$db_host_ip:$mongodb_port/ opnfv/testapi:cvp.0.5.0

diff --git a/dovetail/utils/offline/config.yaml b/dovetail/utils/offline/config.yaml
index bebd6f4..9ff4a38 100644 (file)
--- a/dovetail/utils/offline/config.yaml
+++ b/dovetail/utils/offline/config.yaml
@@ -2,15 +2,15 @@
 docker_images:
   dovetail:
     domain: opnfv
-    tag: cvp.0.4.0
+    tag: cvp.0.5.0
     store_name: image_dovetail.docker
   functest:
     domain: opnfv
-    tag: cvp.0.2.0
+    tag: cvp.0.5.0
     store_name: image_functest.docker
   yardstick:
     domain: opnfv
-    tag: danube.3.1
+    tag: danube.3.2
     store_name: image_yardstick.docker
   bottlenecks:
     domain: opnfv
@@ -18,7 +18,7 @@ docker_images:
     store_name: image_bottlenecks.docker
   testapi:
     domain: opnfv
-    tag: cvp.0.4.0
+    tag: cvp.0.5.0
     store_name: image_testapi.docker
   mongo:
     tag: 3.2.1

diff --git a/setup.cfg b/setup.cfg
index 231e9bd..003d271 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = dovetail
-version = 0.4.0
+version = 0.5.0
 home-page = https://wiki.opnfv.org/display/dovetail
 
 [entry_points]