Fix typo and bugs in perftest

Change-Id: I36dfb9c2d69cd071cfb8567c5c965144288b3407
Signed-off-by: wu.zhihui <wu.zhihui1@zte.com.cn>

diff --git a/benchmarks/perftest/dhrystone.yaml b/benchmarks/perftest/dhrystone.yaml
index 7899bbd..478cd97 100644 (file)
--- a/benchmarks/perftest/dhrystone.yaml
+++ b/benchmarks/perftest/dhrystone.yaml
@@ -19,13 +19,13 @@
       register: home_dir
 
     - name: cleaning tempT
-      file: path=$HOME/tempT state=absent
+      file: path={{home_dir.stdout}}/tempT state=absent
 
     - name: cleaning qtip_result
-      file: path=$HOME/qtip_result state=absent
+      file: path={{home_dir.stdout}}/qtip_result state=absent
 
     - name: make directory
-      file: path=$HOME/qtip_result state=directory
+      file: path={{home_dir.stdout}}/qtip_result state=directory
 
     - include: ./common/sys_proxy_pbook.yaml
 
@@ -88,10 +88,10 @@
       with_items: "{{copy_log_results.stdout_lines}}"
 
     - name: cleaning tempT
-      file: path=$HOME/tempT state=absent
+      file: path={{home_dir.stdout}}/tempT state=absent
 
     - name: cleaning_qtip_result
-      file: path=$HOME/qtip_result state=absent
+      file: path={{home_dir.stdout}}/qtip_result state=absent
 
  - hosts: localhost
    connection: local

diff --git a/benchmarks/perftest/dpi.yaml b/benchmarks/perftest/dpi.yaml
index 5ce5d09..455c5ac 100644 (file)
--- a/benchmarks/perftest/dpi.yaml
+++ b/benchmarks/perftest/dpi.yaml
@@ -22,13 +22,13 @@
       register: home_dir
 
     - name: cleaning
-      file: path=$HOME/tempD state=absent
+      file: path={{home_dir.stdout}}/tempD state=absent
 
     - name: cleaning previous results
-      file: path=$HOME/qtip_result state=absent
+      file: path={{home_dir.stdout}}/qtip_result state=absent
 
     - name: make qtip_result
-      file: path=$HOME/qtip_result state=directory
+      file: path={{home_dir.stdout}}/qtip_result state=directory
 
     - include: ./common/sys_proxy_pbook.yaml
 
@@ -75,13 +75,13 @@
       shell: sudo cp $HOME/tempD/nDPI/example/dpi_dump.txt $HOME/qtip_result
 
     - name: fetch dpi result transform script
-      copy: src={{workdingdir}}/utils/transform/dpi_transform.py dest={{home_dir.stdout}}/qtip_result
+      copy: src={{workingdir}}/utils/transform/dpi_transform.py dest={{home_dir.stdout}}/qtip_result
 
     - name: Transforming results
       shell: cd $HOME/qtip_result && sudo python dpi_transform.py
 
     - name: copy report formation script
-      copy: src={{workdingdir}}/utils/transform/final_report.py dest={{home_dir.stdout}}/qtip_result
+      copy: src={{workingdir}}/utils/transform/final_report.py dest={{home_dir.stdout}}/qtip_result
 
     - name: consolidating report
       shell: cd $HOME/qtip_result && sudo python final_report.py DPI {{fname}}
@@ -103,10 +103,10 @@
       with_items: "{{copy_log_results.stdout_lines}}"
 
     - name: cleaning tempD
-      file: path=$HOME/tempD state=absent
+      file: path={{home_dir.stdout}}/tempD state=absent
 
     - name: cleaning_qtip_result
-      file: path=$HOME/qtip_result state=absent
+      file: path={{home_dir.stdout}}/qtip_result state=absent
 
  - hosts: localhost
    connection: local

diff --git a/benchmarks/perftest/etc/test_job b/benchmarks/perftest/etc/fio_test_job
similarity index 100%
rename from benchmarks/perftest/etc/test_job
rename to benchmarks/perftest/etc/fio_test_job

diff --git a/benchmarks/perftest/fio.yaml b/benchmarks/perftest/fio.yaml
index 94a4c80..23f2b20 100644 (file)
--- a/benchmarks/perftest/fio.yaml
+++ b/benchmarks/perftest/fio.yaml
@@ -20,16 +20,16 @@
       register: home_dir
 
     - name: cleaning fio directory
-      file: path=$HOME/fio state=absent
+      file: path={{home_dir.stdout}}/fio state=absent
 
     - name: cleaning previous results
-      file: path=$HOME/qtip_result state=absent
+      file: path={{home_dir.stdout}}/qtip_result state=absent
 
     - name: making fio temporary directory
-      file: path=$HOME/fio state=directory
+      file: path={{home_dir.stdout}}/fio state=directory
 
     - name: making  results temporary directory
-      file: path=$HOME/qtip_result state=directory
+      file: path={{home_dir.stdout}}/qtip_result state=directory
 
     - include: ./common/sys_proxy_pbook.yaml
 
@@ -61,7 +61,7 @@
       shell: cd $HOME/fio/fio-2.1.10  &&  sudo ./fio --output-format=json --output=$HOME/qtip_result/fio_result.json fio_test_job
 
     - name: Fetching result transformation script
-      copy: src={{workingdir}}/utils/fio_transform.py dest={{home_dir.stdout}}/qtip_result
+      copy: src={{workingdir}}/utils/transform/fio_transform.py dest={{home_dir.stdout}}/qtip_result
 
     - name: Transforming result
       shell: cd $HOME/qtip_result  &&  sudo python fio_transform.py
@@ -89,10 +89,10 @@
       with_items: "{{copy_log_results.stdout_lines}}"
 
     - name: cleaning fio
-      file: path=$HOME/fio state=absent
+      file: path={{home_dir.stdout}}/fio state=absent
 
     - name: cleaning_qtip_result
-      file: path=$HOME/qtip_result
+      file: path={{home_dir.stdout}}/qtip_result state=absent
 
  - hosts: localhost
    connection: local
@@ -109,4 +109,4 @@
       shell: ( find {{workingdir}}/{{Dest_dir}}/fio/fio_temp/ -name "*.log"  | xargs cp -t {{workingdir}}/{{Dest_dir}}/fio/logs)
 
     - name: removing fio_log
-      file: {{workingdir}}/{{Dest_dir}}/fio/fio_temp state=absent
+      file: path={{workingdir}}/{{Dest_dir}}/fio/fio_temp state=absent

diff --git a/benchmarks/perftest/iperf.yaml b/benchmarks/perftest/iperf.yaml
index 481a2e3..46c8d6c 100644 (file)
--- a/benchmarks/perftest/iperf.yaml
+++ b/benchmarks/perftest/iperf.yaml
@@ -40,16 +40,16 @@
       register: home_dir
 
     - name: cleaning iperf directory
-      file: path=$HOME/iperf state=absent
+      file: path={{home_dir.stdout}}/iperf state=absent
 
     - name: cleaning previous results
-      file: path=$HOME/qtip_result state=absent
+      file: path={{home_dir.stdout}}/qtip_result state=absent
 
     - name: making Iperf temporary directory
-      file: path=$HOME/iperf state=directory
+      file: path={{home_dir.stdout}}/iperf state=directory
 
     - name: making results temporary directory
-      file: path=$HOME/qtip_result state=directory
+      file: path={{home_dir.stdout}}/qtip_result state=directory
 
     - include: ./common/sys_proxy_pbook.yaml
 
@@ -104,7 +104,7 @@
       when: rolename =="2-host" and "{{ip2}}" == ''
 
     - name: copy report formation script
-      copy: src={{workdingdir}}/utils/transform/final_report.py dest={{home_dir.stdout}}/qtip_result
+      copy: src={{workingdir}}/utils/transform/final_report.py dest={{home_dir.stdout}}/qtip_result
       when: rolename =="2-host" and "{{ip2}}" == ''
 
     - name: consolidating report
@@ -115,7 +115,7 @@
       shell: (cd $HOME/qtip_result/; find . -maxdepth 1 -name "*.json") | cut -d'/' -f2
       register: files_to_copy
       when: rolename =="2-host" and "{{ip2}}" == ''
-
+    
     - name: copy results
       fetch:  src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/iperf/iperf_temp
       with_items: "{{files_to_copy.stdout_lines}}"
@@ -132,10 +132,10 @@
       when: rolename =="2-host" and "{{ip2}}" == ''
 
     - name: cleaning iperf directory
-      file: path=$HOME/iperf state=absent
+      file: path={{home_dir.stdout}}/iperf state=absent
 
     - name: cleaning previous results
-      file: path=$HOME/qtip_result state=absent
+      file: path={{home_dir.stdout}}/qtip_result state=absent
 
  - hosts: localhost
    connection: local

diff --git a/benchmarks/perftest/ramspeed.yaml b/benchmarks/perftest/ramspeed.yaml
index fb624c8..847a864 100644 (file)
--- a/benchmarks/perftest/ramspeed.yaml
+++ b/benchmarks/perftest/ramspeed.yaml
@@ -20,16 +20,16 @@
       register: home_dir
 
     - name: cleaning ramspeed directory
-      file: path=$HOME/ramspeed state=absent
+      file: path={{home_dir.stdout}}/ramspeed state=absent
 
     - name: cleaning previous results
-      file: path=$HOME/qtip_result state=absent
+      file: path={{home_dir.stdout}}/qtip_result state=absent
 
     - name: making ramspeed temporary directory
-      file: path=$HOME/ramspeed state=directory
+      file: path={{home_dir.stdout}}/ramspeed state=directory
 
     - name: making  results temporary directory
-      file: path=$HOME/qtip_result state=directory
+      file: path={{home_dir.stdout}}/qtip_result state=directory
 
     - include: ./common/sys_proxy_pbook.yaml
 
@@ -64,7 +64,7 @@
       shell: cd $HOME/ramspeed/ramsmp-3.5.0  &&  ./ramsmp -b 6 -l 5 -p 1 >> $HOME/qtip_result/Floatmem
 
     - name: Fetching result transformation script
-      copy: src={{workdingdir}}/utils/transform/ramspeed_transform.py dest={{home_dir.stdout}}/qtip_result
+      copy: src={{workingdir}}/utils/transform/ramspeed_transform.py dest={{home_dir.stdout}}/qtip_result
 
     - name: Transforming result
       shell: cd $HOME/qtip_result  &&  sudo python ramspeed_transform.py
@@ -92,10 +92,10 @@
       with_items: "{{copy_log_results.stdout_lines}}"
 
     - name: cleaning ramspeed directory
-      file: path=$HOME/ramspeed state=absent
+      file: path={{home_dir.stdout}}/ramspeed state=absent
 
     - name: cleaning previous results
-      file: path=$HOME/qtip_result state=absent
+      file: path={{home_dir.stdout}}/qtip_result state=absent
 
  - hosts: localhost
    connection: local

diff --git a/benchmarks/perftest/ssl.yaml b/benchmarks/perftest/ssl.yaml
index ef36265..0c0e512 100644 (file)
--- a/benchmarks/perftest/ssl.yaml
+++ b/benchmarks/perftest/ssl.yaml
@@ -19,16 +19,16 @@
       register: home_dir
 
     - name: cleaning Open_SSL directory
-      file: path=$HOME/Open_SSL state=absent
+      file: path={{home_dir.stdout}}/Open_SSL state=absent
 
     - name: cleaning_qtip_result
-      file: path=$HOME/qtip_result state=absent
+      file: path={{home_dir.stdout}}/qtip_result state=absent
 
     - name: making OpenSSL temporary directory
-      file: path=$HOME/Open_SSL state=directory
+      file: path={{home_dir.stdout}}/Open_SSL state=directory
 
     - name: making  results temporary directory
-      file: path=$HOME/qtip_result state=directory
+      file: path={{home_dir.stdout}}/qtip_result state=directory
 
     - include: ./common/sys_proxy_pbook.yaml
 
@@ -93,10 +93,10 @@
       with_items: "{{copy_log_results.stdout_lines}}"
 
     - name: cleaning Open_SSL directory
-      file: path=$HOME/Open_SSL state=absent
+      file: path={{home_dir.stdout}}/Open_SSL state=absent
 
     - name: cleaning_qtip_result
-      file: path=$HOME/qtip_result state=absent
+      file: path={{home_dir.stdout}}/qtip_result state=absent
 
  - hosts: localhost
    connection: local

diff --git a/benchmarks/perftest/whetstone.yaml b/benchmarks/perftest/whetstone.yaml
index 4dcddb9..9453284 100644 (file)
--- a/benchmarks/perftest/whetstone.yaml
+++ b/benchmarks/perftest/whetstone.yaml
@@ -19,13 +19,13 @@
       register: home_dir
 
     - name: cleaning tempT directory
-      file: path=$HOME/tempT state=absent
+      file: path={{home_dir.stdout}}/tempT state=absent
 
     - name: cleaning qtip result directory
-      file: path=$HOME/qtip_result state=absent
+      file: path={{home_dir.stdout}}/qtip_result state=absent
 
     - name: making qtip_result directory
-      file: path=$HOME/qtip_result state=directory
+      file: path={{home_dir.stdout}}/qtip_result state=directory
 
     - include: ./common/sys_proxy_pbook.yaml
 
@@ -88,10 +88,10 @@
       with_items: "{{copy_log_results.stdout_lines}}"
 
     - name: cleaning tempT directory
-      file: path=$HOME/tempT state=absent
+      file: path={{home_dir.stdout}}/tempT state=absent
 
     - name: cleaning qtip result directory
-      file: path=$HOME/qtip_result state=absent
+      file: path={{home_dir.stdout}}/qtip_result state=absent
 
  - hosts: localhost
    connection: local
@@ -108,4 +108,4 @@
       shell: ( find {{workingdir}}/{{Dest_dir}}/whetstone/whetstone_temp/ -name "*.log"  | xargs cp -t {{workingdir}}/{{Dest_dir}}/whetstone/logs)
 
     - name: removing whetstone_temp
-      file: {{workingdir}}/{{Dest_dir}}/whetstone/whetstone_temp state=absent
+      file: path={{workingdir}}/{{Dest_dir}}/whetstone/whetstone_temp state=absent