From 46754323aeac6193dd9b451a6525a478fdb0887b Mon Sep 17 00:00:00 2001 From: xudan Date: Tue, 29 May 2018 02:42:11 -0400 Subject: Replace openstack commands with shade Use openstack shade to get endpoint infomation rather than executing openstack commands directly. The next step can replace openstack commands by shade for some test cases that need to create openstack resources (images, flavors) if we agree to use shade. JIRA: DOVETAIL-659 Change-Id: I72b302fb2d4a61e9249a7e53f81ea9464944dcd3 Signed-off-by: xudan --- etc/conf/dovetail_config.yml | 3 --- etc/conf/functest_config.yml | 10 +++++++++- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'etc') diff --git a/etc/conf/dovetail_config.yml b/etc/conf/dovetail_config.yml index 312f8ba0..8722e399 100644 --- a/etc/conf/dovetail_config.yml +++ b/etc/conf/dovetail_config.yml @@ -83,9 +83,6 @@ parameters: path: '("validate", "testcase")' include_config: - - functest_config.yml - - yardstick_config.yml - - bottlenecks_config.yml - vnftest_config.yml test_project: diff --git a/etc/conf/functest_config.yml b/etc/conf/functest_config.yml index 93e822f4..1e7cfeb3 100644 --- a/etc/conf/functest_config.yml +++ b/etc/conf/functest_config.yml @@ -1,9 +1,17 @@ --- + +{% set validate_testcase = validate_testcase or '' %} +{% set os_insecure = os_insecure or 'False' %} +{% set os_verify = '' %} +{% if os_insecure == 'True' %} + {% set os_verify = ' -e OS_VERIFY= ' %} +{% endif %} + functest: image_name: opnfv/functest-smoke docker_tag: fraser opts: '-id --privileged=true' - envs: '-e INSTALLER_TYPE=unknown -e DEPLOY_SCENARIO=unknown -e NODE_NAME=unknown + envs: '{{os_verify}} -e INSTALLER_TYPE=unknown -e DEPLOY_SCENARIO=unknown -e NODE_NAME=unknown -e TEST_DB_URL=file:///home/opnfv/functest/results/functest_results.txt' config: dir: '/home/opnfv/userconfig' -- cgit 1.2.3-korg