diff options
Diffstat (limited to 'resources')
5 files changed, 36 insertions, 22 deletions
diff --git a/resources/ansible_roles/qtip-workspace/files/custom/group_vars/all.yml b/resources/ansible_roles/qtip-workspace/files/custom/group_vars/all.yml index 0f9016b4..2967f6eb 100644 --- a/resources/ansible_roles/qtip-workspace/files/custom/group_vars/all.yml +++ b/resources/ansible_roles/qtip-workspace/files/custom/group_vars/all.yml @@ -12,7 +12,7 @@ qtip_results: results qtip_fixtures: fixtures qtip_dump: dump qtip_cache: "{{ qtip_cache }}" -qtip_workdir: "qtip-workdir-{{ lookup('pipe', 'date +%Y%m%d-%H%M') }}" +qtip_workdir: "{% raw %}{{ ansible_env.HOME }}{% endraw %}/qtip-workdir-{{ lookup('pipe', 'date +%Y%m%d-%H%M') }}" installer_master_group: fuel: fuel-masters apex: apex-underclouds diff --git a/resources/ansible_roles/unixbench/tasks/main.yml b/resources/ansible_roles/unixbench/tasks/main.yml index ff2c3534..9b0a6f73 100644 --- a/resources/ansible_roles/unixbench/tasks/main.yml +++ b/resources/ansible_roles/unixbench/tasks/main.yml @@ -35,20 +35,37 @@ shell: "./Run -i {{ iterations }} -c {{ parallel_copies }} dhrystone whetstone" args: chdir: "{{ workdir }}/byte-unixbench-5.1.3/UnixBench" + register: unixbench_out -- name: synchronize test results to local - synchronize: - mode: pull - src: "{{ workdir }}/byte-unixbench-5.1.3/UnixBench/results/" - dest: "{{ qtip_results }}/unixbench" - use_ssh_args: yes +- name: generating log filename + set_fact: + logfile: "{{ qtip_results }}/unixbench.log" -- name: create integer and floating point report +- name: saving output to log + copy: + content: "{{ unixbench_out.stdout }}" + dest: "{{ logfile }}" + delegate_to: localhost + +- name: saving unixbench output to log + copy: + content: "{{ unixbench_out.stdout }}" + dest: "{{ logfile }}" + delegate_to: localhost + +- name: collecting arithmetic metrics from unixbench + collect: + string: "{{ lookup('file', logfile) }}" + patterns: + # Dhrystone 2 using register variables 116700.0 29223521.3 2504.2 + # Double-Precision Whetstone 55.0 3720.5 676.5 + - '^Dhrystone 2 using register variables\s+(\d+\.\d+)\s+(?P<dhrystone_lps>\d+\.\d+)\s+(\d+\.\d+)' + - '^Double-Precision Whetstone\s+(\d+\.\d+)\s+(?P<whetstone_MWIPS>\d+\.\d+)\s+(\d+\.\d+)' + register: arithmetic_metrics + delegate_to: localhost + +- name: creating arithmetic metrics report template: - src: "{{ item }}.j2" - dest: "{{ qtip_results }}/{{ item }}" - with_items: - - floating-point-metrics - - integer-metrics + src: arithmetic-metrics.j2 + dest: "{{ qtip_results }}/arithmetic-metrics" delegate_to: localhost - tags: [report] diff --git a/resources/ansible_roles/unixbench/templates/arithmetic-metrics.j2 b/resources/ansible_roles/unixbench/templates/arithmetic-metrics.j2 new file mode 100644 index 00000000..a12eb0ab --- /dev/null +++ b/resources/ansible_roles/unixbench/templates/arithmetic-metrics.j2 @@ -0,0 +1,5 @@ +Arithmetic +========== + +{{ ('Floating-point (Whetstone MWIPS)', arithmetic_metrics.dhrystone_lps[0])|justify }} +{{ ('Integer (Dhyrstone lps)', arithmetic_metrics.whetstone_MWIPS[0])|justify }} diff --git a/resources/ansible_roles/unixbench/templates/floating-point-metrics.j2 b/resources/ansible_roles/unixbench/templates/floating-point-metrics.j2 deleted file mode 100644 index 73d4dad4..00000000 --- a/resources/ansible_roles/unixbench/templates/floating-point-metrics.j2 +++ /dev/null @@ -1,4 +0,0 @@ -Floating Point -============== - -check logs in ``unixbench/``
\ No newline at end of file diff --git a/resources/ansible_roles/unixbench/templates/integer-metrics.j2 b/resources/ansible_roles/unixbench/templates/integer-metrics.j2 deleted file mode 100644 index ea1de9e9..00000000 --- a/resources/ansible_roles/unixbench/templates/integer-metrics.j2 +++ /dev/null @@ -1,4 +0,0 @@ -Integer -======= - -check logs in ``unixbench/``
\ No newline at end of file |