From 0aacdceeeac62333651ec5440fb32af965c7689e Mon Sep 17 00:00:00 2001
From: xudan <xudan16@huawei.com>
Date: Fri, 8 Sep 2017 02:53:31 -0400
Subject: tag dovetail with 0.6.0

docker image used
opnfv/yardstick: danube.3.2
opnfv/functest: cvp.0.5.0
opnfv/bottlenecks: cvp.0.4.0
opnfv/testapi: cvp.0.6.0
opnfv/dovetail:web.cvp.0.6.0
opnfv/dovetail:api.cvp.0.6.0
opnfv/dovetail: cvp.0.6.0
main changes
Merge all test specification docs about test area tempest and defcore
Merge addendum doc and workflow doc
Remake aarch64 patch for Dovetail container
Remove some tempest test cases that are not too common
Add additional Tempest API test cases into test case tempest.tc005
persist db file in host for mongo container
add nginx to host static files
add a sample tempest_conf.yaml file into userconfig
Add a patch to set ha SLA to be 30 seconds
Modify logs
Bugfix: the config files in useeconfig will cover user's config
Bugfix: functest only keeps the last test case's log
Bugfix: pre_condition cmds is just executed once
For more information, refer to https://wiki.opnfv.org/display/dovetail/Running+history+for+the+dovetail+tool

JIRA: DOVETAIL-497

Change-Id: I74626bbf65ce0121cc7b53394c85694e15df8484
Signed-off-by: xudan <xudan16@huawei.com>
---
 dovetail/conf/dovetail_config.yml     | 1 +
 dovetail/utils/local_db/launch_db.sh  | 4 ++--
 dovetail/utils/local_db/restart_db.sh | 2 +-
 dovetail/utils/offline/config.yaml    | 4 ++--
 setup.cfg                             | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/dovetail/conf/dovetail_config.yml b/dovetail/conf/dovetail_config.yml
index 738b892f..de849a52 100644
--- a/dovetail/conf/dovetail_config.yml
+++ b/dovetail/conf/dovetail_config.yml
@@ -92,3 +92,4 @@ validate_input:
     - 'cvp.0.3.0'
     - 'cvp.0.4.0'
     - 'cvp.0.5.0'
+    - 'cvp.0.6.0'
diff --git a/dovetail/utils/local_db/launch_db.sh b/dovetail/utils/local_db/launch_db.sh
index 956ccfe8..49a50827 100755
--- a/dovetail/utils/local_db/launch_db.sh
+++ b/dovetail/utils/local_db/launch_db.sh
@@ -62,7 +62,7 @@ echo "Create the testapi service."
 echo "=========================="
 
 set +e
-testapi_img="opnfv/testapi:cvp.0.5.0"
+testapi_img="opnfv/testapi:cvp.0.6.0"
 echo "Step1: pull the image $testapi_img."
 sudo docker pull $testapi_img
 set -e
@@ -86,7 +86,7 @@ echo "Wait for testapi to work..."
 sleep 10
 
 set +e
-nginx_img="opnfv/dovetail:nginx.cvp.0.5.0"
+nginx_img="opnfv/dovetail:nginx.cvp.0.6.0"
 echo "Step1: pull the image $nginx_img."
 sudo docker pull $nginx_img
 set -e
diff --git a/dovetail/utils/local_db/restart_db.sh b/dovetail/utils/local_db/restart_db.sh
index e44bc07c..62863a25 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.5.0
+    -e mongodb_url=mongodb://$db_host_ip:$mongodb_port/ opnfv/testapi:cvp.0.6.0
diff --git a/dovetail/utils/offline/config.yaml b/dovetail/utils/offline/config.yaml
index 9ff4a387..397a9b65 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.5.0
+    tag: cvp.0.6.0
     store_name: image_dovetail.docker
   functest:
     domain: opnfv
@@ -18,7 +18,7 @@ docker_images:
     store_name: image_bottlenecks.docker
   testapi:
     domain: opnfv
-    tag: cvp.0.5.0
+    tag: cvp.0.6.0
     store_name: image_testapi.docker
   mongo:
     tag: 3.2.1
diff --git a/setup.cfg b/setup.cfg
index 003d2710..26bc3887 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = dovetail
-version = 0.5.0
+version = 0.6.0
 home-page = https://wiki.opnfv.org/display/dovetail
 
 [entry_points]
-- 
cgit 1.2.3-korg