diff options
| author |   Yujun Zhang <zhang.yujunz@zte.com.cn> | 2017-04-25 16:46:51 +0800 |
|---|---|---|
| committer | Yujun Zhang <zhang.yujunz@zte.com.cn> | 2017-04-25 16:58:31 +0800 |
| commit | d158e53addc56a9f92ecf0947eda4110c23da8ee (patch) | |
| tree | ce0bbffe52abe0b2e0bc91f6cc9638ed1477e413 /resources/ansible_roles/ramspeed | |
| parent | 2189e3bfdf1d250fa1201f89249745d4d6aab7f0 (diff) | |
Organize common tasks under qtip-common role
Change-Id: I8592efdac7e6c2161eb7cb1b36d023697ebe7ad4
Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
Diffstat (limited to 'resources/ansible_roles/ramspeed')
| -rw-r--r-- | resources/ansible_roles/ramspeed/meta/main.yml | 14 | ||||
| -rw-r--r-- | resources/ansible_roles/ramspeed/tasks/main.yml | 10 |
2 files changed, 19 insertions, 5 deletions
diff --git a/resources/ansible_roles/ramspeed/meta/main.yml b/resources/ansible_roles/ramspeed/meta/main.yml new file mode 100644 index 00000000..9f6305c1 --- /dev/null +++ b/resources/ansible_roles/ramspeed/meta/main.yml @@ -0,0 +1,14 @@ +############################################################################## +# Copyright (c) 2017 ZTE Corporation and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +--- + +allow_duplicates: yes +dependencies: +- { role: qtip-common, basename: ramspeed } diff --git a/resources/ansible_roles/ramspeed/tasks/main.yml b/resources/ansible_roles/ramspeed/tasks/main.yml index affa1111..34b38fa1 100644 --- a/resources/ansible_roles/ramspeed/tasks/main.yml +++ b/resources/ansible_roles/ramspeed/tasks/main.yml @@ -45,8 +45,8 @@ - name: generating log filename set_fact: - int_logfile: "{{ qtip_results }}/ramsmp-int.log" - float_logfile: "{{ qtip_results }}/ramsmp-float.log" + int_logfile: "{{ output }}/ramsmp-int.log" + float_logfile: "{{ output }}/ramsmp-float.log" - name: saving integer output to log copy: @@ -69,7 +69,7 @@ - '^INTEGER\s+BatchRun\s+Add:\s+?(?P<add>\d+\.\d+)\sMB/s$' - '^INTEGER\s+BatchRun\s+Triad:\s+?(?P<triad>\d+\.\d+)\sMB/s$' - '^INTEGER\s+BatchRun\s+AVERAGE:\s+?(?P<average>\d+\.\d+)\sMB/s$' - export_to: "{{ qtip_results }}/ram_int_metrics.json" + dest: "{{ output }}/integer-metrics.json" register: intmem_metrics - name: collect float memory metrics from ramspeed @@ -81,11 +81,11 @@ - '^FL-POINT\s+BatchRun\s+Add:\s+?(?P<add>\d+\.\d+)\sMB/s$' - '^FL-POINT\s+BatchRun\s+Triad:\s+?(?P<triad>\d+\.\d+)\sMB/s$' - '^FL-POINT\s+BatchRun\s+AVERAGE:\s+?(?P<average>\d+\.\d+)\sMB/s$' - export_to: "{{ qtip_results }}/ram_float_metrics.json" + dest: "{{ output }}/float-metrics.json" register: floatmem_metrics - name: create memory metrics report template: src: "memory-metrics.j2" - dest: "{{ qtip_results }}/memory-metrics" + dest: "{{ output }}/report" delegate_to: localhost |