From: xudan <xudan16@huawei.com>
Date: Sun, 30 Sep 2018 02:54:38 +0000 (-0400)
Subject: Change to Gambia version by using latest docker images
X-Git-Tag: ovp-3.0.0~92
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=cd4962c9ca223f8b4287dc2123ac40a8652a1028;p=dovetail.git

Change to Gambia version by using latest docker images

Functest use gambia tag. Other projects use their latest one.

Change-Id: Ibbfde50727149822d8331d998f6b4e173f19e244
Signed-off-by: xudan <xudan16@huawei.com>
---

diff --git a/etc/conf/bottlenecks_config.yml b/etc/conf/bottlenecks_config.yml
index b36f8650..c44047fd 100644
--- a/etc/conf/bottlenecks_config.yml
+++ b/etc/conf/bottlenecks_config.yml
@@ -7,7 +7,7 @@
 
 bottlenecks:
   image_name: opnfv/bottlenecks
-  docker_tag: ovp-2.0.0
+  docker_tag: latest
   opts: '-id --privileged=true'
   envs: '-e DEPLOY_SCENARIO={{deploy_scenario}} -e Yardstick_TAG=stable -e OUTPUT_FILE={{testcase}}.out'
   volumes:
diff --git a/etc/conf/functest_config.yml b/etc/conf/functest_config.yml
index 88fc5f73..e82adb77 100644
--- a/etc/conf/functest_config.yml
+++ b/etc/conf/functest_config.yml
@@ -10,7 +10,7 @@
 
 functest:
   image_name: opnfv/functest-smoke
-  docker_tag: opnfv-6.3.0
+  docker_tag: gambia
   opts: '-id --privileged=true'
   envs: '{{os_verify}} -e INSTALLER_TYPE=unknown -e DEPLOY_SCENARIO={{deploy_scenario}} -e NODE_NAME=unknown
          -e TEST_DB_URL=file:///home/opnfv/functest/results/functest_results.txt'
diff --git a/etc/conf/yardstick_config.yml b/etc/conf/yardstick_config.yml
index b61301e7..10436658 100644
--- a/etc/conf/yardstick_config.yml
+++ b/etc/conf/yardstick_config.yml
@@ -12,7 +12,7 @@
 
 yardstick:
   image_name: opnfv/yardstick
-  docker_tag: ovp-2.0.0
+  docker_tag: latest
   opts: '-id --privileged=true'
   envs: "{{os_verify}} -e YARDSTICK_BRANCH=fraser"
   config: