From 31d52cd81cbd143f619d44e113cd6336fc726e40 Mon Sep 17 00:00:00 2001 From: Yujun Zhang Date: Wed, 19 Apr 2017 15:06:28 +0800 Subject: Add UnixBench benchmarking role Change-Id: I14e1630ff67bf4dff0998456e57fee2b1656f585 Signed-off-by: Yujun Zhang --- qtip/driver/playbook/unixbench/setup.yaml | 2 +- resources/roles/unixbench/defaults/main.yml | 12 ++++++++++ resources/roles/unixbench/meta/main.yml | 12 ++++++++++ resources/roles/unixbench/tasks/main.yml | 36 +++++++++++++++++++++++++++++ tests/integration/ansible.cfg | 4 ++++ tests/integration/run.yaml | 5 ++++ 6 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 resources/roles/unixbench/defaults/main.yml create mode 100644 resources/roles/unixbench/meta/main.yml create mode 100644 resources/roles/unixbench/tasks/main.yml diff --git a/qtip/driver/playbook/unixbench/setup.yaml b/qtip/driver/playbook/unixbench/setup.yaml index 4b9b5240..4dcdd2c4 100644 --- a/qtip/driver/playbook/unixbench/setup.yaml +++ b/qtip/driver/playbook/unixbench/setup.yaml @@ -61,5 +61,5 @@ repo: https://github.com/kdlucas/byte-unixbench.git dest: '{{ ansible_env.HOME }}/tempT/' - - name: Make UnixBench + - name: Make UnixBench1 shell: make --directory $HOME/tempT/UnixBench/ \ No newline at end of file diff --git a/resources/roles/unixbench/defaults/main.yml b/resources/roles/unixbench/defaults/main.yml new file mode 100644 index 00000000..d1facef5 --- /dev/null +++ b/resources/roles/unixbench/defaults/main.yml @@ -0,0 +1,12 @@ +############################################################################# +# 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 +############################################################################# + +cwd: "{{ ansible_env.HOME }}/qtip/unixbench" +iterations: 1 +parallel_copies: 1 \ No newline at end of file diff --git a/resources/roles/unixbench/meta/main.yml b/resources/roles/unixbench/meta/main.yml new file mode 100644 index 00000000..03c96c42 --- /dev/null +++ b/resources/roles/unixbench/meta/main.yml @@ -0,0 +1,12 @@ +############################################################################# +# 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 +############################################################################# + +--- +dependencies: + - { role: development-tools } diff --git a/resources/roles/unixbench/tasks/main.yml b/resources/roles/unixbench/tasks/main.yml new file mode 100644 index 00000000..d9d5c8f7 --- /dev/null +++ b/resources/roles/unixbench/tasks/main.yml @@ -0,0 +1,36 @@ +############################################################################# +# 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 +############################################################################# + +- name: make unixbench working directory + file: + path: "{{ cwd }}" + state: directory + +- name: download unixbench source code + unarchive: + src: https://github.com/kdlucas/byte-unixbench/archive/v5.1.3.tar.gz + dest: "{{ cwd }}" + remote_src: yes + +- name: build UnixBench + command: "make" + args: + chdir: "{{ cwd }}/byte-unixbench-5.1.3/UnixBench" + +- name: run whetstone and dhrystone + shell: "./Run -i {{ iterations }} -c {{ parallel_copies }} dhrystone whetstone" + args: + chdir: "{{ cwd }}/byte-unixbench-5.1.3/UnixBench" + +- name: synchronize test results to local + synchronize: + mode: pull + src: "{{ cwd }}/byte-unixbench-5.1.3/UnixBench/results" + dest: "{{ qtip_dump }}/{{ inventory_hostname }}/unixbench" + use_ssh_args: yes diff --git a/tests/integration/ansible.cfg b/tests/integration/ansible.cfg index 30e28480..a94cad0d 100644 --- a/tests/integration/ansible.cfg +++ b/tests/integration/ansible.cfg @@ -28,3 +28,7 @@ filter_plugins = ../../qtip/ansible_library/plugins/filter #strategy_plugins = /usr/share/ansible/plugins/strategy callback_whitelist = profile_tasks + +[ssh_connection] + +ssh_args = -F ./ssh.cfg \ No newline at end of file diff --git a/tests/integration/run.yaml b/tests/integration/run.yaml index bab88d73..696235c2 100644 --- a/tests/integration/run.yaml +++ b/tests/integration/run.yaml @@ -23,6 +23,11 @@ - development-tools tags: [setup] +- hosts: compute + roles: + - unixbench + tags: [unixbench] + - hosts: compute tasks: - name: collect system information -- cgit 1.2.3-korg