Merge "modify logfile directory structure"

13 files changed, 54 insertions, 72 deletions

diff --git a/qtip/driver/playbook/bwn_ng.yaml b/qtip/driver/playbook/bwn_ng.yaml
index f79bb04e..c52cb14e 100644
--- a/qtip/driver/playbook/bwn_ng.yaml
+++ b/qtip/driver/playbook/bwn_ng.yaml
@@ -22,4 +22,4 @@
 - name: Run bwm-ng
   shell: bwm-ng -o plain -c 1 > bwm-dump.log
   args:
-    chdir: '{{ dest_path }}/'
\ No newline at end of file
+    chdir: '{{ dest_path }}'
\ No newline at end of file
diff --git a/qtip/driver/playbook/dpi/run.yaml b/qtip/driver/playbook/dpi/run.yaml
index 58f7eb2f..f4c8c457 100644
--- a/qtip/driver/playbook/dpi/run.yaml
+++ b/qtip/driver/playbook/dpi/run.yaml
@@ -12,22 +12,18 @@
   remote_user: root
 
   tasks:
-    - name: Get current timestamp
-      set_fact:
-        timestamp: "{{ lookup('pipe', 'date +%Y-%m-%d-%H-%M') }}"
-
     - name: Make some directories needed
       file:
-        path: '{{ ansible_env.HOME }}/qtip_result/{{ timestamp }}/{{ ansible_hostname }}'
+        path: '{{ ansible_env.HOME }}/qtip_result/{{ ansible_hostname }}/dpi/'
         state: directory
 
     - include: ../inxi.yaml
       vars:
-        dest_path: '{{ ansible_env.HOME }}/qtip_result/{{ timestamp }}/{{ ansible_hostname }}'
+        dest_path: '{{ ansible_env.HOME }}/qtip_result/{{ ansible_hostname }}/dpi/'
 
     - include: ../top.yaml
       vars:
-        dest_path: '{{ ansible_env.HOME }}/qtip_result/{{ timestamp }}/{{ ansible_hostname }}'
+        dest_path: '{{ ansible_env.HOME }}/qtip_result/{{ ansible_hostname }}/dpi/'
 
     - name: Run nDPI benchmark
       shell: ./dpi_average.sh
@@ -37,10 +33,10 @@
     - name: Copying result and system info to qtip result directory
       command: cp $HOME/tempD/nDPI/example/dpi_dump.txt ./
       args:
-        chdir: '{{ ansible_env.HOME }}/qtip_result/{{ timestamp }}/{{ ansible_hostname }}'
+        chdir: '{{ ansible_env.HOME }}/qtip_result/{{ ansible_hostname }}/dpi/'
 
     - name: Fetch result files to local manchine
       synchronize:
         mode: pull
         src: '{{ ansible_env.HOME }}/qtip_result/'
-        dest: '{{ result_dir }}/dpi/logs/'
+        dest: '{{ result_dir }}/'
diff --git a/qtip/driver/playbook/dpi/setup.yaml b/qtip/driver/playbook/dpi/setup.yaml
index c1b45450..76e62e6d 100644
--- a/qtip/driver/playbook/dpi/setup.yaml
+++ b/qtip/driver/playbook/dpi/setup.yaml
@@ -14,7 +14,7 @@
   tasks:
     - name: Making Dpi directory
       file:
-        path: '{{ result_dir }}/dpi/logs/'
+        path: '{{ result_dir }}/'
         state: directory
 
 - hosts: hosts
diff --git a/qtip/driver/playbook/inxi.yaml b/qtip/driver/playbook/inxi.yaml
index a06da042..2a4d9b3f 100644
--- a/qtip/driver/playbook/inxi.yaml
+++ b/qtip/driver/playbook/inxi.yaml
@@ -22,4 +22,4 @@
 - name: Run inxi
   shell: inxi -b -c0 -n > inxi.log
   args:
-    chdir: '{{ dest_path }}/'
+    chdir: '{{ dest_path }}'
diff --git a/qtip/driver/playbook/openssl/run.yaml b/qtip/driver/playbook/openssl/run.yaml
index 241cac61..db923fed 100644
--- a/qtip/driver/playbook/openssl/run.yaml
+++ b/qtip/driver/playbook/openssl/run.yaml
@@ -12,22 +12,18 @@
   remote_user: root
 
   tasks:
-    - name: Get current timestamp
-      set_fact:
-        timestamp: "{{ lookup('pipe', 'date +%Y-%m-%d-%H-%M') }}"
-
     - name: Make some directories needed
       file:
-        path: '{{ ansible_env.HOME }}/qtip_result/{{ timestamp }}/{{ ansible_hostname }}'
+        path: '{{ ansible_env.HOME }}/qtip_result/{{ ansible_hostname }}/ssl/'
         state: directory
 
     - include: ../inxi.yaml
       vars:
-        dest_path: '{{ ansible_env.HOME }}/qtip_result/{{ timestamp }}/{{ ansible_hostname }}/'
+        dest_path: '{{ ansible_env.HOME }}/qtip_result/{{ ansible_hostname }}/ssl/'
 
     - include: ../top.yaml
       vars:
-        dest_path: '{{ ansible_env.HOME }}/qtip_result/{{ timestamp }}/{{ ansible_hostname }}/'
+        dest_path: '{{ ansible_env.HOME }}/qtip_result/{{ ansible_hostname }}/ssl/'
 
     - name: Benchmarking RSA signatures and AES-128-cbc cipher encryption throughput
       shell: '{{ item }}'
@@ -40,10 +36,10 @@
     - name: Copying result to qtip result directory
       shell: cp ~/Open_SSL/openssl-1.0.2f/apps/*_dump ./
       args:
-        chdir: '{{ ansible_env.HOME }}/qtip_result/{{ timestamp }}/{{ ansible_hostname }}/'
+        chdir: '{{ ansible_env.HOME }}/qtip_result/{{ ansible_hostname }}/ssl/'
 
     - name: Fetch result files to local manchine
       synchronize:
         mode: pull
         src: '{{ ansible_env.HOME }}/qtip_result/'
-        dest: '{{ result_dir }}/ssl/logs/'
+        dest: '{{ result_dir }}/'
diff --git a/qtip/driver/playbook/openssl/setup.yaml b/qtip/driver/playbook/openssl/setup.yaml
index e93bfb8e..3a6f385a 100644
--- a/qtip/driver/playbook/openssl/setup.yaml
+++ b/qtip/driver/playbook/openssl/setup.yaml
@@ -14,7 +14,7 @@
   tasks:
     - name: Making ssl directory
       file:
-        path: '{{ result_dir }}/ssl/logs/'
+        path: '{{ result_dir }}/'
         state: directory
 
 - hosts: hosts
diff --git a/qtip/driver/playbook/ramspeed/run.yaml b/qtip/driver/playbook/ramspeed/run.yaml
index 33c9a6ef..94becb55 100644
--- a/qtip/driver/playbook/ramspeed/run.yaml
+++ b/qtip/driver/playbook/ramspeed/run.yaml
@@ -12,22 +12,18 @@
   remote_user: root
 
   tasks:
-    - name: Get current timestamp
-      set_fact:
-        timestamp: "{{ lookup('pipe', 'date +%Y-%m-%d-%H-%M') }}"
-
     - name: Make some directories needed
       file:
-        path: '{{ ansible_env.HOME }}/qtip_result/{{ timestamp }}/{{ ansible_hostname }}'
+        path: '{{ ansible_env.HOME }}/qtip_result/{{ ansible_hostname }}/ramspeed/'
         state: directory
 
     - include: ../inxi.yaml
       vars:
-        dest_path: '{{ ansible_env.HOME }}/qtip_result/{{ timestamp }}/{{ ansible_hostname }}/'
+        dest_path: '{{ ansible_env.HOME }}/qtip_result/{{ ansible_hostname }}/ramspeed/'
 
     - include: ../top.yaml
       vars:
-        dest_path: '{{ ansible_env.HOME }}/qtip_result/{{ timestamp }}/{{ ansible_hostname }}/'
+        dest_path: '{{ ansible_env.HOME }}/qtip_result/{{ ansible_hostname }}/ramspeed/'
 
     - name: Benchmarking IntMem Bandwidth and FloatMem Bandwidth
       shell: '{{ item }}'
@@ -35,10 +31,10 @@
         - ~/ramspeed/ramsmp-3.5.0/ramsmp -b 3 -l 5 -p 1 >> Intmem
         - ~/ramspeed/ramsmp-3.5.0/ramsmp -b 6 -l 5 -p 1 >> Floatmem
       args:
-        chdir: '{{ ansible_env.HOME }}/qtip_result/{{ timestamp }}/{{ ansible_hostname }}/'
+        chdir: '{{ ansible_env.HOME }}/qtip_result/{{ ansible_hostname }}/whetstone/'
 
     - name: Fetch result files to local manchine
       synchronize:
         mode: pull
         src: '{{ ansible_env.HOME }}/qtip_result/'
-        dest: '{{ result_dir }}/ramspeed/logs/'
+        dest: '{{ result_dir }}/'
diff --git a/qtip/driver/playbook/ramspeed/setup.yaml b/qtip/driver/playbook/ramspeed/setup.yaml
index 60368605..842bbda2 100644
--- a/qtip/driver/playbook/ramspeed/setup.yaml
+++ b/qtip/driver/playbook/ramspeed/setup.yaml
@@ -14,7 +14,7 @@
   tasks:
     - name: Making ramspeed directory
       file:
-        path: '{{ result_dir }}/ramspeed/logs/'
+        path: '{{ result_dir }}/'
         state: directory
 
 - hosts: hosts
diff --git a/qtip/driver/playbook/top.yaml b/qtip/driver/playbook/top.yaml
index 64584338..dfa0aff2 100644
--- a/qtip/driver/playbook/top.yaml
+++ b/qtip/driver/playbook/top.yaml
@@ -9,4 +9,4 @@
 - name: Collect cpu usage
   shell: top -bn1 > top.log
   args:
-    chdir: '{{ dest_path }}/'
+    chdir: '{{ dest_path }}'
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 }}/'