summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhongbo tian <hongbo.tianhongbo@huawei.com>2017-06-27 11:42:56 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-06-27 11:42:56 +0000
commitc3e1d8cb6bb228058a152fdcdbd8dec0d2457748 (patch)
tree2de83168b9d928a110178d13730dcc938028701c
parentfc706f5c364f9ad2f9199cdce1fb85cd3c2bfc1f (diff)
parent8930044a1dfa769570eac5bd62f7e1c51bad4054 (diff)
Merge "Use official Docker images to build local DB"
-rwxr-xr-xdovetail/utils/local_db/launch_db.sh8
-rwxr-xr-xdovetail/utils/local_db/restart_db.sh2
-rw-r--r--dovetail/utils/offline/config.yaml10
3 files changed, 10 insertions, 10 deletions
diff --git a/dovetail/utils/local_db/launch_db.sh b/dovetail/utils/local_db/launch_db.sh
index 77646713..cf002d4c 100755
--- a/dovetail/utils/local_db/launch_db.sh
+++ b/dovetail/utils/local_db/launch_db.sh
@@ -30,8 +30,8 @@ echo "Create the mongodb."
echo "==================="
set +e
-# pull image kkltcjk/mongodb:reporting
-mongodb_img="kkltcjk/mongodb:reporting"
+# pull image mongo:3.2.1
+mongodb_img="mongo:3.2.1"
echo "Step1: pull the image $mongodb_img."
sudo docker pull $mongodb_img
set -e
@@ -59,8 +59,8 @@ echo "Create the testapi service."
echo "=========================="
set +e
-# pull image kkltcjk/testapi:reporting
-testapi_img="kkltcjk/testapi:reporting"
+# pull image opnfv/testapi:cvp.0.1.0
+testapi_img="opnfv/testapi:cvp.0.1.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 39b60e05..93fd12a4 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/ kkltcjk/testapi:reporting
+ -e mongodb_url=mongodb://$db_host_ip:$mongodb_port/ opnfv/testapi:cvp.0.1.0
diff --git a/dovetail/utils/offline/config.yaml b/dovetail/utils/offline/config.yaml
index 185686a5..333f4de9 100644
--- a/dovetail/utils/offline/config.yaml
+++ b/dovetail/utils/offline/config.yaml
@@ -2,22 +2,22 @@
docker_images:
dovetail:
domain: opnfv
- tag: latest
+ tag: cvp.0.1.0
store_name: image_dovetail.docker
functest:
domain: opnfv
- tag: latest
+ tag: danube.2.0
store_name: image_functest.docker
yardstick:
domain: opnfv
- tag: latest
+ tag: danube.2.0
store_name: image_yardstick.docker
testapi:
domain: opnfv
- tag: latest
+ tag: cvp.0.1.0
store_name: image_testapi.docker
mongo:
- tag: 3.5
+ tag: 3.2.1
store_name: image_mongo.docker
docker_save_path: /home/opnfv/dovetail/results/