From 628d8e4f591290671172dd79017e1b40cba0c1e6 Mon Sep 17 00:00:00 2001
From: "wu.zhihui" <wu.zhihui1@zte.com.cn>
Date: Fri, 10 Mar 2017 02:09:10 +0800
Subject: modify logfile directory structure

After one qtip test execution, the logfiles will be stored like this:

`-- 2017-03-09-17-40
    `-- node-41
        |-- dhrystone
        |   |-- inxi.log
        |   |-- node-41.zte.com.cn-2017-03-09-01
        |   |-- node-41.zte.com.cn-2017-03-09-01.html
        |   |-- node-41.zte.com.cn-2017-03-09-01.log
        |   `-- top.log
        |-- dpi
        |   |-- dpi_dump.txt
        |   |-- inxi.log
        |   `-- top.log
        |-- ramspeed
        |   |-- Floatmem
        |   |-- Intmem
        |   |-- inxi.log
        |   `-- top.log
        |-- ssl
        |   |-- AES-128-CBC_dump
        |   |-- RSA_dump
        |   |-- inxi.log
        |   `-- top.log
        `-- whetstone
            |-- inxi.log
            |-- node-41.zte.com.cn-2017-03-09-01
            |-- node-41.zte.com.cn-2017-03-09-01.html
            |-- node-41.zte.com.cn-2017-03-09-01.log
            `-- top.log

Change-Id: I5889a0e5dbe99f28212d6e0cdf69b9c03d89a9fe
Signed-off-by: wu.zhihui <wu.zhihui1@zte.com.cn>
---
 qtip/driver/playbook/unixbench/dhrystone.yaml | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

(limited to 'qtip/driver/playbook/unixbench/dhrystone.yaml')

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 }}/'
-- 
cgit 1.2.3-korg