From 6ba79be2ab9a0843684555e8c1d58ff8292481af Mon Sep 17 00:00:00 2001
From: "wu.zhihui" <wu.zhihui1@zte.com.cn>
Date: Tue, 25 Oct 2016 14:27:09 +0800
Subject: bugfix on perftest

1. Correct path of common directory
2. cleanup the directories qtip creates on host
3. typo
4. use module file instead of shell command to create/cleanup
directory

Change-Id: I85960998c15d2a1934e8ae5047b71fc91c936a46
Signed-off-by: wu.zhihui <wu.zhihui1@zte.com.cn>
---
 benchmarks/perftest/iperf.yaml | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

(limited to 'benchmarks/perftest/iperf.yaml')

diff --git a/benchmarks/perftest/iperf.yaml b/benchmarks/perftest/iperf.yaml
index af5b836a..481a2e3e 100644
--- a/benchmarks/perftest/iperf.yaml
+++ b/benchmarks/perftest/iperf.yaml
@@ -39,21 +39,21 @@
       shell: echo $HOME
       register: home_dir
 
-    - name: cleaning
-      shell: sudo rm -rf $HOME/iperf
+    - name: cleaning iperf directory
+      file: path=$HOME/iperf state=absent
 
     - name: cleaning previous results
-      shell: sudo rm -rf $HOME/qtip_result
+      file: path=$HOME/qtip_result state=absent
 
     - name: making Iperf temporary directory
-      shell: sudo mkdir $HOME/iperf
+      file: path=$HOME/iperf state=directory
 
     - name: making results temporary directory
-      shell: sudo mkdir $HOME/qtip_result
+      file: path=$HOME/qtip_result state=directory
 
-    - include: ../common/sys_proxy_pbook.yaml
+    - include: ./common/sys_proxy_pbook.yaml
 
-    - include: ../common/sys_info_pbook.yaml
+    - include: ./common/sys_info_pbook.yaml
       vars:
         network: true
 
@@ -131,6 +131,11 @@
       with_items: "{{copy_log_results.stdout_lines}}"
       when: rolename =="2-host" and "{{ip2}}" == ''
 
+    - name: cleaning iperf directory
+      file: path=$HOME/iperf state=absent
+
+    - name: cleaning previous results
+      file: path=$HOME/qtip_result state=absent
 
  - hosts: localhost
    connection: local
@@ -147,15 +152,15 @@
       when: rolename == "2-host"
 
     - name: making_logs_folder
-      shell: mkdir -p {{workingdir}}/{{Dest_dir}}/iperf/logs
+      file: path={{workingdir}}/{{Dest_dir}}/iperf/logs state=directory
 
     - name: extracting_log
       shell: ( find {{workingdir}}/{{Dest_dir}}/iperf/iperf_temp/ -name "*.log"  | xargs cp -t {{workingdir}}/{{Dest_dir}}/iperf/logs)
       when: rolename == "2-host"
 
     - name: removing iperf_raw file
-      shell: rm -rf {{workingdir}}/{{Dest_dir}}/iperf/iperf_raw.json
+      file: path={{workingdir}}/{{Dest_dir}}/iperf/iperf_raw.json state=absent
       when: rolename == "2-host"
 
     - name: removing iperf_temp
-      shell: rm -rf {{workingdir}}/{{Dest_dir}}/iperf/iperf_temp
+      file: path={{workingdir}}/{{Dest_dir}}/iperf/iperf_temp state=absent
-- 
cgit 1.2.3-korg