From 82bc118989534ae75b5eea0c00f6d793558f3150 Mon Sep 17 00:00:00 2001
From: xudan <xudan16@huawei.com>
Date: Sat, 26 May 2018 02:52:39 -0400
Subject: Remove functest_testsuite and functest_testcase in
 dovetail_config.yml

The 2 sections 'functest_testsuite' and 'functest_testcase' are used by
all Functest test cases.

They aim to parse the results of Tempest sub test cases.

Remove them, and check the sub test case list,
1. if it's empty, that means no need to check sub test cases
2. if it is not empty, check the sub test cases one by one.

Additional, remove some useless keys in dovetail_config.yml

JIRA: DOVETAIL-658

Change-Id: Ic829264b0c8eaedd8e2b3fa55b38a34644482c20
Signed-off-by: xudan <xudan16@huawei.com>
---
 etc/conf/dovetail_config.yml | 45 --------------------------------------------
 1 file changed, 45 deletions(-)

(limited to 'etc/conf')

diff --git a/etc/conf/dovetail_config.yml b/etc/conf/dovetail_config.yml
index 0150e2d8..57efbbff 100644
--- a/etc/conf/dovetail_config.yml
+++ b/etc/conf/dovetail_config.yml
@@ -12,21 +12,6 @@ pod_file: 'pod.yaml'
 # If use password to login hosts, there's no need to provide the private key
 pri_key: 'id_rsa'
 
-# SDNVPN offline image
-sdnvpn_image: 'ubuntu-16.04-server-cloudimg-amd64-disk1.img'
-
-# Tempest image
-cirros_image: 'cirros-0.3.5-x86_64-disk.img'
-
-# Ubuntu 14.04 image for snaps_smoke
-ubuntu14_image: 'ubuntu-14.04-server-cloudimg-amd64-disk1.img'
-
-# cloudify_ims image
-cloudify_image: 'cloudify-manager-premium-4.0.1.qcow2'
-
-# Trusty image
-trusty_image: 'trusty-server-cloudimg-amd64-disk1.img'
-
 # testsuite supported, should adjust accordingly
 testsuite_supported:
   - proposed_tests
@@ -47,30 +32,6 @@ testarea_supported:
   - vnf
   - vping
 
-functest_testsuite:
-  - refstack_defcore
-  - tempest_smoke_serial
-  - tempest_full_parallel
-  - tempest_custom
-  - rally_sanity
-  - promise
-  - patrole
-  - neutron_trunk
-
-functest_testcase:
-  - bgpvpn
-  - connection_check
-  - api_check
-  - snaps_health_check
-  - vping_ssh
-  - vping_userdata
-  - doctor
-  - copper
-  - cloudify_ims
-  - odl
-  - snaps_smoke
-  - juju_epc
-
 # used for testcase cmd template in jinja2 format
 # we have two variables available now
 # parameter path, use this path to walk through python object and get value
@@ -83,9 +44,3 @@ parameters:
 
 include_config:
   - vnftest_config.yml
-
-test_project:
-  - 'yardstick'
-  - 'functest'
-  - 'bottlenecks'
-  - 'vnftest'
-- 
cgit 1.2.3-korg