From 8930044a1dfa769570eac5bd62f7e1c51bad4054 Mon Sep 17 00:00:00 2001
From: xudan <xudan16@huawei.com>
Date: Fri, 23 Jun 2017 02:36:50 -0400
Subject: Use official Docker images to build local DB

JIRA: DOVETAIL-422

1. Use official Docker images, mongo:3.2.1 and opnfv/testapi:cvp.0.1.0,
   to build local database and testapi service.
2. Use the stable Docker tag in offline config file.

Change-Id: I446a4248effc95f6f5aa6a6d90c0d31ef2f60b39
Signed-off-by: xudan <xudan16@huawei.com>
---
 dovetail/utils/local_db/launch_db.sh  |  8 ++++----
 dovetail/utils/local_db/restart_db.sh |  2 +-
 dovetail/utils/offline/config.yaml    | 10 +++++-----
 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/
 
-- 
cgit 1.2.3-korg