diff options
author | xudan <xudan16@huawei.com> | 2017-05-25 04:35:18 -0400 |
---|---|---|
committer | xudan <xudan16@huawei.com> | 2017-05-25 22:51:50 -0400 |
commit | ed7f8ee3697be3751dc6cfb243cc55092ddd1dd5 (patch) | |
tree | 82e64038198e38303286f256441ee6245e44b659 /dovetail/conf | |
parent | ed7de0f59902094646ec53e0c3af192538833611 (diff) |
Change the directories of results and some files to DOVETAIL_HOME
JIRA: DOVETAIL-438
1. Need an env variable DOVETAIL_HOME in env_config.sh
2. env_config.sh, pod.yaml and id_rsa should be put in path DOVETAIL_HOME/pre_config
3. the results will also be put in this path
4. no need to give the path of openstack credential file while running a testsuite
5. if running with the code, source the env_config.sh file before running
source $DOVETAIL_HOME/env_config.sh
dovetail run --testsuite <testsuite_name>
6. if running with Dovetail docker image
docker run -it --privileged=true -e DOVETAIL_HOME=<dovetail_home_path>
-v <dovetail_home_path>:<dovetail_home_path>
-v /var/run/docker.sock:/var/run/docker.sock
opnfv/dovetail:latest /bin/bash
Change-Id: Ia23078f27a34e293d0075e49c673930f41069cb6
Signed-off-by: xudan <xudan16@huawei.com>
Diffstat (limited to 'dovetail/conf')
-rw-r--r-- | dovetail/conf/cmd_config.yml | 7 | ||||
-rw-r--r-- | dovetail/conf/dovetail_config.yml | 12 | ||||
-rw-r--r-- | dovetail/conf/yardstick_config.yml | 2 |
3 files changed, 12 insertions, 9 deletions
diff --git a/dovetail/conf/cmd_config.yml b/dovetail/conf/cmd_config.yml index da8c4732..aa27f293 100644 --- a/dovetail/conf/cmd_config.yml +++ b/dovetail/conf/cmd_config.yml @@ -29,13 +29,6 @@ cli: path: - 'functest/docker_tag' help: 'Overwrite tag for functest docker container (e.g. stable or latest)' - openrc: - flags: - - '--openrc' - - '-o' - path: - - 'openrc' - help: 'Openstack Credential file location' control: testsuite: flags: diff --git a/dovetail/conf/dovetail_config.yml b/dovetail/conf/dovetail_config.yml index 934ff6a6..36b31401 100644 --- a/dovetail/conf/dovetail_config.yml +++ b/dovetail/conf/dovetail_config.yml @@ -5,7 +5,17 @@ report_dest: 'file' result_file: 'results.json' # OPENSTACK Credential file -openrc: '/home/opnfv/dovetail/openrc.sh' +env_file: 'env_config.sh' + +# POD info file +pod_file: 'pod.yaml' + +# JUMPSERVER private key used in pod_file to login hosts +# 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' COMPLIANCE_PATH: compliance/ TESTCASE_PATH: testcase/ diff --git a/dovetail/conf/yardstick_config.yml b/dovetail/conf/yardstick_config.yml index ae59a9ec..bc207d7f 100644 --- a/dovetail/conf/yardstick_config.yml +++ b/dovetail/conf/yardstick_config.yml @@ -16,7 +16,7 @@ yardstick: - "cd /home/opnfv/repos/yardstick && source tests/ci/prepare_env.sh && yardstick -d task start tests/opnfv/test_cases/{{validate_testcase}}.yaml --output-file /home/opnfv/yardstick/results/{{validate_testcase}}.out - --task-args '{'file': '/home/opnfv/userconfig/pod.yaml'}'" + --task-args '{'file': '/home/opnfv/userconfig/pre_config/pod.yaml'}'" post_condition: - '' result: |