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/ssl.yaml | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

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

diff --git a/benchmarks/perftest/ssl.yaml b/benchmarks/perftest/ssl.yaml
index 4b5f036a..ef36265e 100644
--- a/benchmarks/perftest/ssl.yaml
+++ b/benchmarks/perftest/ssl.yaml
@@ -18,21 +18,21 @@
       shell: sudo echo $HOME
       register: home_dir
 
-    - name: cleaning
-      shell: sudo rm -rf $HOME/Open_SSL
+    - name: cleaning Open_SSL directory
+      file: path=$HOME/Open_SSL state=absent
 
-    - name: cleaning previous results
-      shell: sudo rm -rf $HOME/qtip_result
+    - name: cleaning_qtip_result
+      file: path=$HOME/qtip_result state=absent
 
     - name: making OpenSSL temporary directory
-      shell: sudo mkdir $HOME/Open_SSL
+      file: path=$HOME/Open_SSL 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: false
 
@@ -53,10 +53,10 @@
       shell: cd $HOME/Open_SSL/openssl-1.0.2f  && sudo ./config
 
     - name: make
-      shell: cd  $HOME/Open_SSL/openssl-1.0.2f && sudo make
+      shell: cd $HOME/Open_SSL/openssl-1.0.2f && sudo make
 
     - name: make install
-      shell: cd  $HOME/Open_SSL/openssl-1.0.2f  && sudo make install
+      shell: cd $HOME/Open_SSL/openssl-1.0.2f  && sudo make install
 
     - name: Benchmarking RSA signatures
       shell: cd $HOME/Open_SSL/openssl-1.0.2f/apps  &&  sudo ./openssl speed rsa >> $HOME/qtip_result/RSA_dump
@@ -92,6 +92,12 @@
       fetch:  src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/ssl/ssl_temp
       with_items: "{{copy_log_results.stdout_lines}}"
 
+    - name: cleaning Open_SSL directory
+      file: path=$HOME/Open_SSL state=absent
+
+    - name: cleaning_qtip_result
+      file: path=$HOME/qtip_result state=absent
+
  - hosts: localhost
    connection: local
    gather_facts: no
@@ -104,10 +110,10 @@
       shell: ( find {{workingdir}}/{{Dest_dir}}/ssl/ssl_temp/ -name "*.json" | xargs cp -t {{workingdir}}/{{Dest_dir}}/ssl/)
 
     - name: making_logs_folder
-      shell: mkdir -p {{workingdir}}/{{Dest_dir}}/ssl/logs
+      file: path={{workingdir}}/{{Dest_dir}}/ssl/logs state=directory
 
     - name: extracting_log
       shell: ( find {{workingdir}}/{{Dest_dir}}/ssl/ssl_temp/ -name "*.log"  | xargs cp -t {{workingdir}}/{{Dest_dir}}/ssl/logs)
 
     - name: removing ssl_temp
-      shell: rm -rf {{workingdir}}/{{Dest_dir}}/ssl/ssl_temp
+      file: path={{workingdir}}/{{Dest_dir}}/ssl/ssl_temp state=absent
-- 
cgit 1.2.3-korg