From 3f25a0a90a034f999e06f5475c857cf12d6ce43b Mon Sep 17 00:00:00 2001
From: xudan <xudan16@huawei.com>
Date: Wed, 16 Aug 2017 06:25:31 -0400
Subject: 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>
---
 dovetail/conf/cmd_config.yml          | 4 ++--
 dovetail/conf/dovetail_config.yml     | 1 +
 dovetail/conf/yardstick_config.yml    | 2 +-
 dovetail/utils/local_db/launch_db.sh  | 4 ++--
 dovetail/utils/local_db/restart_db.sh | 2 +-
 dovetail/utils/offline/config.yaml    | 8 ++++----
 6 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'dovetail')

diff --git a/dovetail/conf/cmd_config.yml b/dovetail/conf/cmd_config.yml
index d862a910..58409f2b 100644
--- 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 20aeec93..738b892f 100644
--- 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 fd93d61a..62a4abf9 100644
--- 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 a7439b66..4461be0b 100755
--- 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 668b4b84..e44bc07c 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.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 bebd6f4a..9ff4a387 100644
--- 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
-- 
cgit 1.2.3-korg