summaryrefslogtreecommitdiffstats
path: root/dovetail/conf
diff options
context:
space:
mode:
authorxudan <xudan16@huawei.com>2017-04-25 08:58:15 +0000
committerxudan <xudan16@huawei.com>2017-04-25 09:33:16 +0000
commitf08a5d3b07e401213afb88f0100786fba6a624ff (patch)
tree719c5538c69a09d9ef8f68edabfaa2941d8e64e0 /dovetail/conf
parentdfeb31d74c5193956a0e77ad76054fc4aa7b100b (diff)
Bugfix: All HA testcases are SSH timeout in CI jobs
JIRA: DOVETAIL-405 1. All HA test cases running in CI are SSH timeout. 2. The reason is that HA test cases need a file pod.yaml providing the info of each node of Openstack. 3. This pod.yaml should be put in $DOVETAIL_HOME/dovetail/userconfig by users. 4. Dovetail's CI jobs should also do some adaptions. JIRA: DOVETAIL-407 5. modify file .gitignore to ignore directories results/ and userconfig/. Change-Id: I5c681445ec83c9d67a0151370f5b56840ffe444c Signed-off-by: xudan <xudan16@huawei.com>
Diffstat (limited to 'dovetail/conf')
-rw-r--r--dovetail/conf/yardstick_config.yml16
1 files changed, 10 insertions, 6 deletions
diff --git a/dovetail/conf/yardstick_config.yml b/dovetail/conf/yardstick_config.yml
index e9a674a9..ac128fb8 100644
--- a/dovetail/conf/yardstick_config.yml
+++ b/dovetail/conf/yardstick_config.yml
@@ -3,16 +3,20 @@ yardstick:
image_name: opnfv/yardstick
docker_tag: latest
opts: '-id --privileged=true'
+ config:
+ dir: '/home/opnfv/userconfig'
pre_condition:
- - 'cd /home/opnfv/repos/yardstick && source tests/ci/prepare_env.sh &&
- source tests/ci/clean_images.sh && cleanup'
- - 'cd /home/opnfv/repos/yardstick && source tests/ci/prepare_env.sh &&
- source tests/ci/load_images.sh'
+ - ''
+ # - 'cd /home/opnfv/repos/yardstick && source tests/ci/prepare_env.sh &&
+ # source tests/ci/clean_images.sh && cleanup'
+ # - 'cd /home/opnfv/repos/yardstick && source tests/ci/prepare_env.sh &&
+ # source tests/ci/load_images.sh'
cmds:
- 'mkdir -p /home/opnfv/yardstick/results/'
- - 'cd /home/opnfv/repos/yardstick && source tests/ci/prepare_env.sh &&
+ - "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'
+ --output-file /home/opnfv/yardstick/results/{{validate_testcase}}.out
+ --task-args '{'file': '/home/opnfv/userconfig/pod.yaml'}'"
post_condition:
- ''
result: