diff options
| author |   xudan <xudan16@huawei.com> | 2017-03-17 09:23:45 +0000 |
|---|---|---|
| committer | xudan <xudan16@huawei.com> | 2017-03-21 01:34:24 +0000 |
| commit | f7d0d72958b41ea6685457abea6dc4d83f4370c3 (patch) | |
| tree | ff367071b3f2223724ccbc6e34a4174c9a7d233c /dovetail/conf | |
| parent | 3cf37c9ac7b40a388f81fed13cfb0ad606dcd9a1 (diff) | |
dovetail tool: remove installer and CI related variables
JIRA: DOVETAIL-371
1. remove all the envs in functest_config.yml and yardstick_config.yml
2. remove all relative cmds in cmd_config.yml
3. remove all the envs when running a new functest/yardstick container
4. add some variables just for functest pushing results to db
5. get the external network name for yardstick
6. make --debug/-d just control the log level shown on the screen
7. set requests=2.10.0 since python-openstackclient needs
'requests!=2.12.2,!=2.13.0,>=2.10.0'
Change-Id: I9f941e09d067fc95a14c3c9be1374f41df4a9a16
Signed-off-by: xudan <xudan16@huawei.com>
Diffstat (limited to 'dovetail/conf')
| -rw-r--r-- | dovetail/conf/cmd_config.yml | 30 | ||||
| -rw-r--r-- | dovetail/conf/dovetail_config.yml | 6 | ||||
| -rw-r--r-- | dovetail/conf/functest_config.yml | 5 | ||||
| -rw-r--r-- | dovetail/conf/yardstick_config.yml | 4 |
4 files changed, 6 insertions, 39 deletions
diff --git a/dovetail/conf/cmd_config.yml b/dovetail/conf/cmd_config.yml index 05567709..2ae0402e 100644 --- a/dovetail/conf/cmd_config.yml +++ b/dovetail/conf/cmd_config.yml @@ -15,30 +15,6 @@ cli: options: config: - SUT_TYPE: - flags: - - '--SUT_TYPE' - - '-t' - path: - - 'functest/envs' - - 'yardstick/envs' - help: 'Installer type of the system under test (SUT).' - SUT_IP: - flags: - - '--SUT_IP' - - '-i' - path: - - 'functest/envs' - - 'yardstick/envs' - help: 'IP of the system under test (SUT).' - debug: - flags: - - '--debug' - - '-d' - path: - - 'functest/envs' - - 'yardstick/envs' - help: 'True for showing debug log on screen.' yard_tag: flags: - '--yard_tag' @@ -71,3 +47,9 @@ cli: - '--testarea' default: 'full' help: 'compliance testarea within testsuite' + debug: + flags: + - '--debug' + - '-d' + is_flag: 'True' + help: 'Flag for showing debug log on screen.' diff --git a/dovetail/conf/dovetail_config.yml b/dovetail/conf/dovetail_config.yml index 9d2c0cf3..9521617e 100644 --- a/dovetail/conf/dovetail_config.yml +++ b/dovetail/conf/dovetail_config.yml @@ -57,12 +57,6 @@ test_project: - 'functest' validate_input: - valid_sut_type: - - 'compass' - - 'fuel' - - 'joid' - - 'apex' - valid_docker_tag: - 'stable' - 'latest' diff --git a/dovetail/conf/functest_config.yml b/dovetail/conf/functest_config.yml index 2fca713d..8195c547 100644 --- a/dovetail/conf/functest_config.yml +++ b/dovetail/conf/functest_config.yml @@ -2,11 +2,6 @@ functest: image_name: opnfv/functest docker_tag: latest - envs: '-e INSTALLER_TYPE=compass -e INSTALLER_IP=192.168.200.2 - -e NODE_NAME=dovetail-pod -e DEPLOY_SCENARIO=ha_nosdn - -e BUILD_TAG=daily-dovetail-001 -e CI_DEBUG=true - -e DEPLOY_TYPE=baremetal - -e RESULTS_STORE=file:///home/opnfv/functest/results/functest_result.json' opts: '-id --privileged=true' pre_condition: - 'echo test for precondition in functest' diff --git a/dovetail/conf/yardstick_config.yml b/dovetail/conf/yardstick_config.yml index 029100cd..a70749d9 100644 --- a/dovetail/conf/yardstick_config.yml +++ b/dovetail/conf/yardstick_config.yml @@ -2,10 +2,6 @@ yardstick: image_name: opnfv/yardstick docker_tag: latest - envs: '-e INSTALLER_TYPE=compass -e INSTALLER_IP=192.168.200.2 - -e NODE_NAME=dovetail-pod -e DEPLOY_SCENARIO=ha_nosdn - -e BUILD_TAG=dovetail -e CI_DEBUG=true -e DEPLOY_TYPE=baremetal - -e EXTERNAL_NETWORK=ext-net' opts: '-id --privileged=true' pre_condition: - 'source /home/opnfv/repos/yardstick/tests/ci/prepare_env.sh && |