Some modifications for ansible playbook

- typo in ramspeed/run.yaml
- fix result logfile name for dhrystone and whetstone

Change-Id: Ic8456174a14d04c2207990eccb16601762c5a880
Signed-off-by: wu.zhihui <wu.zhihui1@zte.com.cn>
(cherry picked from commit 764c2d3916f1390e2ee2ca3b3efbcc33050fd525)

diff --git a/qtip/driver/playbook/ramspeed/run.yaml b/qtip/driver/playbook/ramspeed/run.yaml
index 94becb5..496cd5d 100644 (file)
--- a/qtip/driver/playbook/ramspeed/run.yaml
+++ b/qtip/driver/playbook/ramspeed/run.yaml
@@ -31,7 +31,7 @@
         - ~/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/{{ ansible_hostname }}/whetstone/'
+        chdir: '{{ ansible_env.HOME }}/qtip_result/{{ ansible_hostname }}/ramspeed/'
 
     - name: Fetch result files to local manchine
       synchronize:

diff --git a/qtip/driver/playbook/unixbench/dhrystone.yaml b/qtip/driver/playbook/unixbench/dhrystone.yaml
index caa97f4..a0ee89a 100644 (file)
--- a/qtip/driver/playbook/unixbench/dhrystone.yaml
+++ b/qtip/driver/playbook/unixbench/dhrystone.yaml
@@ -25,8 +25,12 @@
   args:
     chdir: '{{ ansible_env.HOME }}/tempT/UnixBench/'
 
-- name: Copying result and system info to qtip result directory
-  shell: mv ~/tempT/UnixBench/results/* ./
+- name: Copying result to qtip result directory
+  shell: '{{ item }}'
+  with_items:
+    - mv ~/tempT/UnixBench/results/*.log ./
+    - mv ~/tempT/UnixBench/results/*.html ./
+    - mv ~/tempT/UnixBench/results/* ./dhrystone
   args:
     chdir: '{{ ansible_env.HOME }}/qtip_result/{{ ansible_hostname }}/dhrystone/'
 

diff --git a/qtip/driver/playbook/unixbench/whetstone.yaml b/qtip/driver/playbook/unixbench/whetstone.yaml
index 723fb3a..c753779 100644 (file)
--- a/qtip/driver/playbook/unixbench/whetstone.yaml
+++ b/qtip/driver/playbook/unixbench/whetstone.yaml
@@ -25,8 +25,12 @@
   args:
     chdir: '{{ ansible_env.HOME }}/tempT/UnixBench/'
 
-- name: Copying result and system info to qtip result directory
-  shell: mv ~/tempT/UnixBench/results/* ./
+- name: Copying result to qtip result directory
+  shell: '{{ item }}'
+  with_items:
+    - mv ~/tempT/UnixBench/results/*.log ./
+    - mv ~/tempT/UnixBench/results/*.html ./
+    - mv ~/tempT/UnixBench/results/* ./whetstone
   args:
     chdir: '{{ ansible_env.HOME }}/qtip_result/{{ ansible_hostname }}/whetstone/'