Support to specify docker image for each test case

1. Currently each type of test cases will use one docker image.
2. For example,
   Functest test cases use opnfv/functest-restapi:euphrates
   Yardstick uses opnfv/yardstick:opnfv-5.1.0
3. It needs to support to specify the docker image for each test case.
4. For example,
   vping test cases use opnfv/functest-smoke:euphrates
   sdnvpn uses opnfv/functest-features:euphrates
5. The benefit of this is that these docker images are well verified
   by Functest CI and from Functest plan, they may not support
   functest-restapi docker image in its future release.

JIRA: DOVETAIL-638

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

8 files changed, 8 insertions, 1 deletions

diff --git a/etc/conf/functest_config.yml b/etc/conf/functest_config.yml
index e5f21a9c..f76bac4d 100644
--- a/etc/conf/functest_config.yml
+++ b/etc/conf/functest_config.yml
@@ -1,6 +1,6 @@
 ---
 functest:
-  image_name: opnfv/functest-restapi
+  image_name: opnfv/functest-smoke
   docker_tag: euphrates
   opts: '-id --privileged=true'
   envs: '-e INSTALLER_TYPE=unknown -e DEPLOY_SCENARIO=unknown -e NODE_NAME=unknown
diff --git a/etc/testcase/sdnvpn.tc000.yml b/etc/testcase/sdnvpn.tc000.yml
index 8a4d6bfa..4b1acf23 100644
--- a/etc/testcase/sdnvpn.tc000.yml
+++ b/etc/testcase/sdnvpn.tc000.yml
@@ -5,6 +5,7 @@ dovetail.sdnvpn.tc000:
   validate:
     type: functest
     testcase: bgpvpn
+    image_name: opnfv/functest-features
     pre_condition:
       - "sed -i 's/networking_bgpvpn_tempest/networking_bgpvpn_tempest-r networking_bgpvpn_tempest.tests.api.test_bgpvpn.BgpvpnTest*/' /usr/lib/python2.7/site-packages/sdnvpn/test/functest/tempest.py"
       - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
diff --git a/etc/testcase/sdnvpn.tc001.yml b/etc/testcase/sdnvpn.tc001.yml
index 698b0d2e..a5f9fd00 100644
--- a/etc/testcase/sdnvpn.tc001.yml
+++ b/etc/testcase/sdnvpn.tc001.yml
@@ -5,6 +5,7 @@ dovetail.sdnvpn.tc001:
   validate:
     type: functest
     testcase: bgpvpn
+    image_name: opnfv/functest-features
     pre_copy:
       exist_src_file: sdnvpn_config_testcase1.yaml
       dest_path: /usr/lib/python2.7/site-packages/sdnvpn/test/functest/config.yaml
diff --git a/etc/testcase/sdnvpn.tc002.yml b/etc/testcase/sdnvpn.tc002.yml
index 4823ee55..06f4d65c 100644
--- a/etc/testcase/sdnvpn.tc002.yml
+++ b/etc/testcase/sdnvpn.tc002.yml
@@ -5,6 +5,7 @@ dovetail.sdnvpn.tc002:
   validate:
     type: functest
     testcase: bgpvpn
+    image_name: opnfv/functest-features
     pre_copy:
       exist_src_file: sdnvpn_config_testcase2.yaml
       dest_path: /usr/lib/python2.7/site-packages/sdnvpn/test/functest/config.yaml
diff --git a/etc/testcase/sdnvpn.tc003.yml b/etc/testcase/sdnvpn.tc003.yml
index fbf13ca3..e609390a 100644
--- a/etc/testcase/sdnvpn.tc003.yml
+++ b/etc/testcase/sdnvpn.tc003.yml
@@ -5,6 +5,7 @@ dovetail.sdnvpn.tc003:
   validate:
     type: functest
     testcase: bgpvpn
+    image_name: opnfv/functest-features
     pre_copy:
       exist_src_file: sdnvpn_config_testcase3.yaml
       dest_path: /usr/lib/python2.7/site-packages/sdnvpn/test/functest/config.yaml
diff --git a/etc/testcase/sdnvpn.tc004.yml b/etc/testcase/sdnvpn.tc004.yml
index 5f44f12d..f3628b8a 100644
--- a/etc/testcase/sdnvpn.tc004.yml
+++ b/etc/testcase/sdnvpn.tc004.yml
@@ -5,6 +5,7 @@ dovetail.sdnvpn.tc004:
   validate:
     type: functest
     testcase: bgpvpn
+    image_name: opnfv/functest-features
     pre_copy:
       exist_src_file: sdnvpn_config_testcase4.yaml
       dest_path: /usr/lib/python2.7/site-packages/sdnvpn/test/functest/config.yaml
diff --git a/etc/testcase/sdnvpn.tc008.yml b/etc/testcase/sdnvpn.tc008.yml
index d818bf10..71190223 100644
--- a/etc/testcase/sdnvpn.tc008.yml
+++ b/etc/testcase/sdnvpn.tc008.yml
@@ -5,6 +5,7 @@ dovetail.sdnvpn.tc008:
   validate:
     type: functest
     testcase: bgpvpn
+    image_name: opnfv/functest-features
     pre_copy:
       exist_src_file: sdnvpn_config_testcase8.yaml
       dest_path: /usr/lib/python2.7/site-packages/sdnvpn/test/functest/config.yaml
diff --git a/etc/testcase/vnf.tc001.yml b/etc/testcase/vnf.tc001.yml
index d2a8d70c..5fe02fb3 100644
--- a/etc/testcase/vnf.tc001.yml
+++ b/etc/testcase/vnf.tc001.yml
@@ -5,5 +5,6 @@ dovetail.vnf.tc001:
   validate:
     type: functest
     testcase: cloudify_ims
+    image_name: opnfv/functest-vnf
   report:
     sub_testcase_list: