Playbooks for unixbench

Actually, both dhrystone and whether use unixbench tool
to get metric. Their playbook are too smiliar.
The playbooks under /unixbench can be used to measure
both of them.

Change-Id: I26e31c2b4ac4de35ff8b7ec6dea26b676d5078de
Signed-off-by: wu.zhihui <wu.zhihui1@zte.com.cn>

diff --git a/qtip/driver/playbook/dhrystone/run.yaml b/qtip/driver/playbook/dhrystone/run.yaml
deleted file mode 100644 (file)
index 55de659..0000000
--- a/qtip/driver/playbook/dhrystone/run.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-##############################################################################
-# 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
-##############################################################################
-
-- hosts: hosts
-  become: yes
-  remote_user: root
-
-  tasks:
-    - name: Get current timestamp
-      set_fact:
-        timestamp: "{{ lookup('pipe', 'date +%Y-%m-%d-%H-%M') }}"
-
-    - name: Checking home directory
-      shell: echo $HOME
-      register: home_dir
-
-    - name: Fetch hostname
-      shell: hostname
-      register: host_name
-
-    - name: Make UnixBench
-      shell: make --directory $HOME/tempT/UnixBench/
-
-    - name: Make some directories needed
-      file:
-        path: '{{ home_dir.stdout }}/qtip_result/{{ timestamp }}/{{ host_name.stdout }}'
-        state: directory
-
-    - include: ../inxi.yaml
-
-    - include: ../top.yaml
-
-    - name: Run dhrystone
-      shell: ./Run -v dhrystone
-      args:
-        chdir: '{{ home_dir.stdout }}/tempT/UnixBench/'
-
-    - name: Copying result to qtip result directory
-      shell: cp -r $HOME/tempT/UnixBench/results/* ./
-      args:
-        chdir: '{{ home_dir.stdout }}/qtip_result/{{ timestamp }}/{{ host_name.stdout }}'
-
-    - name: Copy top log to qtip result directory
-      shell: mv $HOME/qtip_result/top.log ./
-      args:
-        chdir: '{{ home_dir.stdout }}/qtip_result/{{ timestamp }}/{{ host_name.stdout }}'
-
-    - name: Copy inxi log to qtip result directory
-      shell: mv $HOME/qtip_result/inxi.log ./
-      args:
-        chdir: '{{ home_dir.stdout }}/qtip_result/{{ timestamp }}/{{ host_name.stdout }}'
-
-    - name: Fetch result files to local manchine
-      synchronize:
-        mode: pull
-        src: '{{ home_dir.stdout }}/qtip_result/'
-        dest: '{{ result_dir }}/dhrystone/logs/'

diff --git a/qtip/driver/playbook/dhrystone/clean.yaml b/qtip/driver/playbook/unixbench/clean.yaml
similarity index 77%
rename from qtip/driver/playbook/dhrystone/clean.yaml
rename to qtip/driver/playbook/unixbench/clean.yaml
index 72bfab7..a7cb254 100644 (file)
--- a/qtip/driver/playbook/dhrystone/clean.yaml
+++ b/qtip/driver/playbook/unixbench/clean.yaml
@@ -1,6 +1,6 @@
 ##############################################################################
 # Copyright (c) 2017 ZTE Corporation and others.
-#
+# zhihui.wu1@zte.com.cn
 # 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
@@ -12,16 +12,14 @@
   remote_user: root
 
   tasks:
-    - name: Checking home directory
-      shell: echo $HOME
-      register: home_dir
-
     - name: Cleaning tempT
       file:
-        path: '{{ home_dir.stdout }}/tempT'
+        path: '{{ ansible_env.HOME }}/tempT'
         state: absent
 
     - name: Cleaning qtip_result
       file:
-        path: '{{ home_dir.stdout }}/qtip_result'
+        path: '{{ ansible_env.HOME }}/qtip_result'
         state: absent
+
+

diff --git a/qtip/driver/playbook/unixbench/dhrystone.yaml b/qtip/driver/playbook/unixbench/dhrystone.yaml
new file mode 100644 (file)
index 0000000..431814d
--- /dev/null
+++ b/qtip/driver/playbook/unixbench/dhrystone.yaml
@@ -0,0 +1,27 @@
+##############################################################################
+# Copyright (c) 2017 ZTE Corporation and others.
+# zhihui.wu1@zte.com.cn
+# 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: Run dhrystone
+  shell: ./Run -v dhrystone
+  args:
+    chdir: '{{ ansible_env.HOME }}/tempT/UnixBench/'
+
+- name: Copying result and system info to qtip result directory
+  shell: '{{ item }}'
+  with_items:
+    - mv ~/tempT/UnixBench/results/* ./
+    - cp ~/qtip_result/inxi.log ~/qtip_result/top.log ./
+  args:
+    chdir: '{{ ansible_env.HOME }}/qtip_result/{{ timestamp }}/{{ ansible_hostname }}'
+
+- name: Fetch dhrystone result files to local manchine
+  synchronize:
+    mode: pull
+    src: '{{ ansible_env.HOME }}/qtip_result/'
+    dest: '{{ result_dir }}/dhrystone/logs/'

diff --git a/qtip/driver/playbook/unixbench/run.yaml b/qtip/driver/playbook/unixbench/run.yaml
new file mode 100644 (file)
index 0000000..acef36a
--- /dev/null
+++ b/qtip/driver/playbook/unixbench/run.yaml
@@ -0,0 +1,37 @@
+##############################################################################
+# Copyright (c) 2017 ZTE Corporation and others.
+# zhihui.wu1@zte.com.cn
+# 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
+##############################################################################
+
+- hosts: hosts
+  become: yes
+  remote_user: root
+
+  tasks:
+    - set_fact:
+        is_dhrystone: "{{ dhrystone | default(False) }}"
+        is_whetstone: "{{ whetstone | default(False) }}"
+        timestamp: "{{ lookup('pipe', 'date +%Y-%m-%d-%H-%M') }}"
+
+    - name: Make some directories needed
+      file:
+        path: '{{ ansible_env.HOME }}/qtip_result/{{ timestamp }}/{{ ansible_hostname }}'
+        state: directory
+
+    - include: ../inxi.yaml
+      vars:
+        dest_path: '{{ ansible_env.HOME }}/qtip_result/'
+
+    - include: ../top.yaml
+      vars:
+        dest_path: '{{ ansible_env.HOME }}/qtip_result/'
+
+    - include: ./dhrystone.yaml
+      when: "{{ is_dhrystone }}"
+
+    - include: ./whetstone.yaml
+      when: "{{ is_whetstone }}"
\ No newline at end of file

diff --git a/qtip/driver/playbook/dhrystone/setup.yaml b/qtip/driver/playbook/unixbench/setup.yaml
similarity index 69%
rename from qtip/driver/playbook/dhrystone/setup.yaml
rename to qtip/driver/playbook/unixbench/setup.yaml
index 430670c..283884a 100644 (file)
--- a/qtip/driver/playbook/dhrystone/setup.yaml
+++ b/qtip/driver/playbook/unixbench/setup.yaml
@@ -1,39 +1,46 @@
-##############################################################################
+#############################################################################
 # Copyright (c) 2017 ZTE Corporation and others.
-#
+# zhihui.wu1@zte.com.cn
 # 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
-##############################################################################
+#############################################################################
 
 - hosts: localhost
   connection: local
   gather_facts: no
 
   tasks:
+    - set_fact:
+        is_dhrystone: "{{ dhrystone | default(False) }}"
+        is_whetstone: "{{ whetstone | default(False) }}"
+
     - name: Making dhrystone directory
       file:
         path: '{{ result_dir }}/dhrystone/logs/'
         state: directory
+      when: '{{ is_dhrystone }}'
+
+    - name: Making whetstone directory
+      file:
+        path: '{{ result_dir }}/whetstone/logs/'
+        state: directory
+      when: '{{ is_whetstone }}'
 
 - hosts: hosts
   become: yes
   remote_user: root
 
   tasks:
-    - name: Checking home directory
-      shell: echo $HOME
-      register: home_dir
-
     - name: Cleaning tempT directory
       file:
-        path: '{{ home_dir.stdout }}/tempT'
+        path: '{{ ansible_env.HOME }}/tempT'
         state: absent
 
     - name: Cleaning qtip_result directory
       file:
-        path: '{{ home_dir.stdout }}/qtip_result'
+        path: '{{ ansible_env.HOME }}/qtip_result'
         state: absent
 
     - include: ../prepare_env.yaml
@@ -60,7 +67,10 @@
         - patch
         - perl
 
-    - name: Clone unixbench
+    - name: Clone UnixBench
       git:
         repo: https://github.com/kdlucas/byte-unixbench.git
-        dest: '{{ home_dir.stdout }}/tempT'
+        dest: '{{ ansible_env.HOME }}/tempT/'
+
+    - name: Make UnixBench
+      shell: make --directory $HOME/tempT/UnixBench/
\ No newline at end of file

diff --git a/qtip/driver/playbook/unixbench/whetstone.yaml b/qtip/driver/playbook/unixbench/whetstone.yaml
new file mode 100644 (file)
index 0000000..f09e4e5
--- /dev/null
+++ b/qtip/driver/playbook/unixbench/whetstone.yaml
@@ -0,0 +1,28 @@
+##############################################################################
+# Copyright (c) 2017 ZTE Corporation and others.
+# zhihui.wu1@zte.com.cn
+# 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: Run whetstone
+  shell: ./Run -v whetstone
+  when: whetstone
+  args:
+    chdir: '{{ ansible_env.HOME }}/tempT/UnixBench/'
+
+- name: Copying result and system info to qtip result directory
+  shell: '{{ item }}'
+  with_items:
+    - mv ~/tempT/UnixBench/results/* ./
+    - cp ~/qtip_result/inxi.log ~/qtip_result/top.log ./
+  args:
+    chdir: '{{ ansible_env.HOME }}/qtip_result/{{ timestamp }}/{{ ansible_hostname }}'
+
+- name: Fetch whetstone result files to local manchine
+  synchronize:
+    mode: pull
+    src: '{{ ansible_env.HOME }}/qtip_result/'
+    dest: '{{ result_dir }}/whetstone/logs/'