4 files changed, 33 insertions, 39 deletions
diff --git a/qtip/driver/playbook/unixbench/dhrystone.yaml b/qtip/driver/playbook/unixbench/dhrystone.yaml
index 431814dd..caa97f44 100644
--- a/qtip/driver/playbook/unixbench/dhrystone.yaml
+++ b/qtip/driver/playbook/unixbench/dhrystone.yaml
@@ -7,21 +7,31 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
+- name: Make dhrystone directories
+  file:
+    path: '{{ ansible_env.HOME }}/qtip_result/{{ ansible_hostname }}/dhrystone/'
+    state: directory
+
+- include: ../inxi.yaml
+  vars:
+    dest_path: '{{ ansible_env.HOME }}/qtip_result/{{ ansible_hostname }}/dhrystone/'
+
+- include: ../top.yaml
+  vars:
+    dest_path: '{{ ansible_env.HOME }}/qtip_result/{{ ansible_hostname }}/dhrystone/'
+
 - 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 ./
+  shell: mv ~/tempT/UnixBench/results/* ./
   args:
-    chdir: '{{ ansible_env.HOME }}/qtip_result/{{ timestamp }}/{{ ansible_hostname }}'
+    chdir: '{{ ansible_env.HOME }}/qtip_result/{{ ansible_hostname }}/dhrystone/'
 
 - name: Fetch dhrystone result files to local manchine
   synchronize:
     mode: pull
     src: '{{ ansible_env.HOME }}/qtip_result/'
-    dest: '{{ result_dir }}/dhrystone/logs/'
+    dest: '{{ result_dir }}/'
diff --git a/qtip/driver/playbook/unixbench/run.yaml b/qtip/driver/playbook/unixbench/run.yaml
index acef36a7..fbe4d4ad 100644
--- a/qtip/driver/playbook/unixbench/run.yaml
+++ b/qtip/driver/playbook/unixbench/run.yaml
@@ -15,20 +15,6 @@
     - 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 }}"
diff --git a/qtip/driver/playbook/unixbench/setup.yaml b/qtip/driver/playbook/unixbench/setup.yaml
index 283884ac..4b9b5240 100644
--- a/qtip/driver/playbook/unixbench/setup.yaml
+++ b/qtip/driver/playbook/unixbench/setup.yaml
@@ -12,21 +12,10 @@
   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/'
+        path: '{{ result_dir }}/'
         state: directory
-      when: '{{ is_whetstone }}'
 
 - hosts: hosts
   become: yes
diff --git a/qtip/driver/playbook/unixbench/whetstone.yaml b/qtip/driver/playbook/unixbench/whetstone.yaml
index f09e4e53..723fb3a6 100644
--- a/qtip/driver/playbook/unixbench/whetstone.yaml
+++ b/qtip/driver/playbook/unixbench/whetstone.yaml
@@ -7,22 +7,31 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
+- name: Make whetstone directories
+  file:
+    path: '{{ ansible_env.HOME }}/qtip_result/{{ ansible_hostname }}/whetstone/'
+    state: directory
+
+- include: ../inxi.yaml
+  vars:
+    dest_path: '{{ ansible_env.HOME }}/qtip_result/{{ ansible_hostname }}/whetstone/'
+
+- include: ../top.yaml
+  vars:
+    dest_path: '{{ ansible_env.HOME }}/qtip_result/{{ ansible_hostname }}/whetstone/'
+
 - 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 ./
+  shell: mv ~/tempT/UnixBench/results/* ./
   args:
-    chdir: '{{ ansible_env.HOME }}/qtip_result/{{ timestamp }}/{{ ansible_hostname }}'
+    chdir: '{{ ansible_env.HOME }}/qtip_result/{{ ansible_hostname }}/whetstone/'
 
 - name: Fetch whetstone result files to local manchine
   synchronize:
     mode: pull
     src: '{{ ansible_env.HOME }}/qtip_result/'
-    dest: '{{ result_dir }}/whetstone/logs/'
+    dest: '{{ result_dir }}/'