diff options
| author |   xudan <xudan16@huawei.com> | 2018-04-07 23:42:50 -0400 |
|---|---|---|
| committer |   Georg Kunz <georg.kunz@ericsson.com> | 2018-04-10 10:21:21 +0000 |
| commit | d596c9988d82cb6876b0acd12e79a89319bdbd0b (patch) | |
| tree | 8cb05f39c1e447dddb383d272d2a83af944127af /etc | |
| parent | 8b0d80d556dfd7935b6464ec76b49c9c0e6249e0 (diff) | |
Decoupling Yardstick Docker config items from source code
There are some special Docker setting items when creating
Yardstick Docker Containers.
1. Remove the extra settings which are required by Yardstick Danube.
2. Remove the settings for pushing results to DB because Dovetail
plan to disable this function.
3. Move the other special Functest settings to config files.
JIRA: DOVETAIL-640
Change-Id: Ic2d90393e227d7886b14d805eaa307b7aef56e4a
Signed-off-by: xudan <xudan16@huawei.com>
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/conf/yardstick_config.yml | 20 | ||||
| -rw-r--r-- | etc/testcase/ha.tc011.yml | 3 |
2 files changed, 13 insertions, 10 deletions
diff --git a/etc/conf/yardstick_config.yml b/etc/conf/yardstick_config.yml index 1b924d85..6e09c271 100644 --- a/etc/conf/yardstick_config.yml +++ b/etc/conf/yardstick_config.yml @@ -4,31 +4,35 @@ {% set attack_process = attack_process or '' %} {% set validate_testcase = validate_testcase or '' %} {% set testcase = testcase or '' %} +{% set os_insecure = os_insecure or 'False' %} +{% set os_cacert = '' %} +{% if os_insecure == 'True' %} + {% set os_cacert = ' -e OS_CACERT=False ' %} +{% endif %} yardstick: image_name: opnfv/yardstick docker_tag: opnfv-5.1.0 opts: '-id --privileged=true' + envs: {{os_cacert}} config: dir: '/home/opnfv/userconfig' pre_condition: - 'echo this is pre_condition' cmds: - - 'mkdir -p /home/opnfv/yardstick/results/' - "cd /home/opnfv/repos/yardstick && source /etc/yardstick/openstack.creds && yardstick task start tests/opnfv/test_cases/{{validate_testcase}}.yaml - --output-file /home/opnfv/yardstick/results/{{testcase}}.out + --output-file /tmp/yardstick/{{testcase}}.out --task-args '{'file': '/home/opnfv/userconfig/pre_config/pod.yaml', 'attack_host': {{attack_host}}, 'attack_process': {{attack_process}}}'" post_condition: - 'echo this is post_condition' result: - dir: '/home/opnfv/yardstick/results' - log: '/tmp/yardstick' + dir: '/tmp/yardstick' file_path: 'yardstick.log' - key_path: '/root/.ssh/id_rsa' openrc: '/etc/yardstick/openstack.creds' - yard_conf: - src_file: '/home/opnfv/repos/yardstick/etc/yardstick/yardstick.conf.sample' - dest_file: '/etc/yardstick/yardstick.conf' + copy_file_in_container: + - + src_file: 'pre_config/id_rsa' + dest_file: '/root/.ssh/id_rsa' diff --git a/etc/testcase/ha.tc011.yml b/etc/testcase/ha.tc011.yml index e7e67e75..7f5a7d4b 100644 --- a/etc/testcase/ha.tc011.yml +++ b/etc/testcase/ha.tc011.yml @@ -10,10 +10,9 @@ dovetail.ha.tc011: --disk-format qcow2 --container-format bare --public --file /home/opnfv/userconfig/images/cirros-0.3.5-x86_64-disk.img' cmds: - - 'mkdir -p /home/opnfv/yardstick/results/' - "cd /home/opnfv/repos/yardstick && source /etc/yardstick/openstack.creds && yardstick task start tests/opnfv/test_cases/{{validate_testcase}}.yaml - --output-file /home/opnfv/yardstick/results/{{testcase}}.out + --output-file /tmp/yardstick/{{testcase}}.out --task-args '{'file': '/home/opnfv/userconfig/pre_config/pod.yaml', 'image': 'cirros-ha-11', 'flavor': 'm1.tiny'}'" post_condition: |