diff options
author | xudan <xudan16@huawei.com> | 2017-07-20 22:06:51 -0400 |
---|---|---|
committer | xudan <xudan16@huawei.com> | 2017-07-21 03:51:44 -0400 |
commit | 14e89740cbd51b5f6d37d1d2139ac28c4a59ef0e (patch) | |
tree | 0df265d5d9780d1748772bd949b5d11e31867136 /dovetail | |
parent | f2a48dfef3fab2ae37694728b144cc592837810b (diff) |
Tag dovetail with cvp.0.3.0
JIRA: DOVETAIL-468
1. docker image used
yardstick: danube.3.1
functest: cvp.0.2.0
testapi: cvp.0.3.0
dovetail: cvp.0.3.0
2. main changes
fix dovetail docker version to be 17.03.0-ce
adapt yardstick danube.3.1
For more information, refer to
https://wiki.opnfv.org/display/dovetail/Running+history+for+the+dovetail+tool
Change-Id: Ie8bb2cfbad4b416404f5aaa2c40c1d3832be676f
Signed-off-by: xudan <xudan16@huawei.com>
Diffstat (limited to 'dovetail')
-rw-r--r-- | dovetail/conf/dovetail_config.yml | 2 | ||||
-rw-r--r-- | dovetail/conf/yardstick_config.yml | 2 | ||||
-rwxr-xr-x | dovetail/utils/local_db/launch_db.sh | 4 | ||||
-rwxr-xr-x | dovetail/utils/local_db/restart_db.sh | 2 | ||||
-rw-r--r-- | dovetail/utils/offline/config.yaml | 6 |
5 files changed, 9 insertions, 7 deletions
diff --git a/dovetail/conf/dovetail_config.yml b/dovetail/conf/dovetail_config.yml index 793c7051..fecc0ae1 100644 --- a/dovetail/conf/dovetail_config.yml +++ b/dovetail/conf/dovetail_config.yml @@ -79,5 +79,7 @@ validate_input: - 'danube.1.0' - 'danube.2.0' - 'danube.3.0' + - 'danube.3.1' - '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 56ad75a5..fd93d61a 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.0 + docker_tag: danube.3.1 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 e31f47ce..722dc227 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.2.0 -testapi_img="opnfv/testapi:cvp.0.2.0" +# pull image opnfv/testapi:cvp.0.3.0 +testapi_img="opnfv/testapi:cvp.0.3.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 5d6b9b68..35096b99 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.2.0 + -e mongodb_url=mongodb://$db_host_ip:$mongodb_port/ opnfv/testapi:cvp.0.3.0 diff --git a/dovetail/utils/offline/config.yaml b/dovetail/utils/offline/config.yaml index edb8a5b8..11134dd1 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.2.0 + tag: cvp.0.3.0 store_name: image_dovetail.docker functest: domain: opnfv @@ -10,11 +10,11 @@ docker_images: store_name: image_functest.docker yardstick: domain: opnfv - tag: danube.3.0 + tag: danube.3.1 store_name: image_yardstick.docker testapi: domain: opnfv - tag: cvp.0.2.0 + tag: cvp.0.3.0 store_name: image_testapi.docker mongo: tag: 3.2.1 |