summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthewLi <matthew.lijun@huawei.com>2017-06-29 23:49:50 -0400
committerMatthewLi <matthew.lijun@huawei.com>2017-07-03 22:04:04 -0400
commitcc034a7135cf70f137915f8b55c8ef00ab61e96e (patch)
treec40ff3da082214b96d2a12f6863bf37eafd993ce
parenta6112b4fdd288fee0e04f7821b94dcc533737b58 (diff)
tag dovetail with 0.2.0
JIRA: DOVETAIL-447 docker images used yardstick danube.3.0 functest cvp.0.2.0 testapi cvp.0.2.0 dovetail cvp.0.2.0 main changes 1, fix yardstick HA bugs 2, fix functest sdnvpn offlinebugs 3, fix dovetail https bugs, etc. for more info, refer to https://wiki.opnfv.org/display/dovetail/Running+history+for+the+dovetail+tool Change-Id: I4edb61b84ed80d8d7624f69db372fec60d73aa38 Signed-off-by: MatthewLi <matthew.lijun@huawei.com>
-rw-r--r--dovetail/conf/dovetail_config.yml2
-rw-r--r--dovetail/conf/functest_config.yml2
-rw-r--r--dovetail/conf/yardstick_config.yml2
-rwxr-xr-xdovetail/utils/local_db/launch_db.sh4
-rwxr-xr-xdovetail/utils/local_db/restart_db.sh2
-rw-r--r--dovetail/utils/offline/config.yaml8
-rw-r--r--setup.cfg2
7 files changed, 12 insertions, 10 deletions
diff --git a/dovetail/conf/dovetail_config.yml b/dovetail/conf/dovetail_config.yml
index 36b31401..793c7051 100644
--- a/dovetail/conf/dovetail_config.yml
+++ b/dovetail/conf/dovetail_config.yml
@@ -79,3 +79,5 @@ validate_input:
- 'danube.1.0'
- 'danube.2.0'
- 'danube.3.0'
+ - 'cvp.0.1.0'
+ - 'cvp.0.2.0'
diff --git a/dovetail/conf/functest_config.yml b/dovetail/conf/functest_config.yml
index 05eaa909..c33a0a91 100644
--- a/dovetail/conf/functest_config.yml
+++ b/dovetail/conf/functest_config.yml
@@ -1,7 +1,7 @@
---
functest:
image_name: opnfv/functest
- docker_tag: danube.2.0
+ docker_tag: cvp.0.2.0
opts: '-id --privileged=true'
config:
dir: '/home/opnfv/userconfig'
diff --git a/dovetail/conf/yardstick_config.yml b/dovetail/conf/yardstick_config.yml
index 34d5a0d8..86a768d5 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.2.0
+ docker_tag: danube.3.0
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 cf002d4c..e31f47ce 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.1.0
-testapi_img="opnfv/testapi:cvp.0.1.0"
+# pull image opnfv/testapi:cvp.0.2.0
+testapi_img="opnfv/testapi:cvp.0.2.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 93fd12a4..5d6b9b68 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.1.0
+ -e mongodb_url=mongodb://$db_host_ip:$mongodb_port/ opnfv/testapi:cvp.0.2.0
diff --git a/dovetail/utils/offline/config.yaml b/dovetail/utils/offline/config.yaml
index 333f4de9..edb8a5b8 100644
--- a/dovetail/utils/offline/config.yaml
+++ b/dovetail/utils/offline/config.yaml
@@ -2,19 +2,19 @@
docker_images:
dovetail:
domain: opnfv
- tag: cvp.0.1.0
+ tag: cvp.0.2.0
store_name: image_dovetail.docker
functest:
domain: opnfv
- tag: danube.2.0
+ tag: cvp.0.2.0
store_name: image_functest.docker
yardstick:
domain: opnfv
- tag: danube.2.0
+ tag: danube.3.0
store_name: image_yardstick.docker
testapi:
domain: opnfv
- tag: cvp.0.1.0
+ tag: cvp.0.2.0
store_name: image_testapi.docker
mongo:
tag: 3.2.1
diff --git a/setup.cfg b/setup.cfg
index 4908f194..37b03123 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
[metadata]
name = dovetail
-version = 0.1.0
+version = 0.2.0
home-page = https://wiki.opnfv.org/display/dovetail
[entry_points]