Resolving bug for result collection

For all benchmarks, the final ansible play to consolidate
json was failing in docker containers

Change-Id: I3611d74b7dbd38eccd46f9dcc982473f96b16157
Signed-off-by: Nauman_Ahad <Nauman_Ahad@dell.com>
(cherry picked from commit 688380c212d1fc7cceb969a4d150c7764fcdeb77)

diff --git a/benchmarks/playbooks/dhrystone.yaml b/benchmarks/playbooks/dhrystone.yaml
index d825e87..8144cc0 100644 (file)
--- a/benchmarks/playbooks/dhrystone.yaml
+++ b/benchmarks/playbooks/dhrystone.yaml
@@ -72,11 +72,11 @@
    connection: local
    tasks:
     - name: extracting_json
-      shell: ( find  ../../{{Dest_dir}}/dhrystone/dhrystone_temp/ -name "*.json" | xargs cp -t ../../{{Dest_dir}}/dhrystone/)
+      shell: (find  ../../{{Dest_dir}}/dhrystone/dhrystone_temp/ -name "*.json" | xargs cp -t ../../{{Dest_dir}}/dhrystone/)
     - name: making_logs_folder
       shell: mkdir -p ../../{{Dest_dir}}/dhrystone/logs
     - name: extracting_log
-      shell: ( find ../../{{Dest_dir}}/dhrystone/dhrystone_temp/ -name "*.log"  | xargs cp -t ../../{{Dest_dir}}/dhrystone/logs)
+      shell: (find ../../{{Dest_dir}}/dhrystone/dhrystone_temp/ -name "*.log"  | xargs cp -t ../../{{Dest_dir}}/dhrystone/logs)
     - name: removing dhrystone_temp 
       shell: rm -rf ../../{{Dest_dir}}/dhrystone/dhrystone_temp 
    # - name: cleaning_2

diff --git a/benchmarks/playbooks/dpi.yaml b/benchmarks/playbooks/dpi.yaml
index 3bc6e01..029133d 100644 (file)
--- a/benchmarks/playbooks/dpi.yaml
+++ b/benchmarks/playbooks/dpi.yaml
@@ -77,10 +77,10 @@
    connection: local
    tasks:
     - name: extracting_json
-      shell: ( find  ../../{{Dest_dir}}/dpi/dpi_temp/ -name "*.json" | xargs cp -t ../../{{Dest_dir}}/dpi/)
+      shell: (find  ../../{{Dest_dir}}/dpi/dpi_temp/ -name "*.json" | xargs cp -t ../../{{Dest_dir}}/dpi/)
     - name: making_logs_folder
       shell: mkdir -p ../../{{Dest_dir}}/dpi/logs
     - name: extracting_log
-      shell: ( find ../../{{Dest_dir}}/dpi/dpi_temp/ -name "*.log"  | xargs cp -t ../../{{Dest_dir}}/dpi/logs)
+      shell: (find ../../{{Dest_dir}}/dpi/dpi_temp/ -name "*.log"  | xargs cp -t ../../{{Dest_dir}}/dpi/logs)
     - name: removing dpi_temp
-      shell: rm -rf ../../{{Dest_dir}}/dpi/dpi_temp
\ No newline at end of file
+      shell: rm -rf ../../{{Dest_dir}}/dpi/dpi_temp

diff --git a/benchmarks/playbooks/fio.yaml b/benchmarks/playbooks/fio.yaml
index b0774fc..f1d54fd 100644 (file)
--- a/benchmarks/playbooks/fio.yaml
+++ b/benchmarks/playbooks/fio.yaml
@@ -67,11 +67,11 @@
    connection: local
    tasks:
     - name: extracting_json
-      shell: ( find  ../../{{Dest_dir}}/fio/fio_temp/ -name "*.json" | xargs cp -t ../../{{Dest_dir}}/fio/)
+      shell: (find  ../../{{Dest_dir}}/fio/fio_temp/ -name "*.json" | xargs cp -t ../../{{Dest_dir}}/fio/)
     - name: making_logs_folder
       shell: mkdir -p ../../{{Dest_dir}}/fio/logs
     - name: extracting_log
-      shell: ( find ../../{{Dest_dir}}/fio/fio_temp/ -name "*.log"  | xargs cp -t ../../{{Dest_dir}}/fio/logs)
+      shell: (find ../../{{Dest_dir}}/fio/fio_temp/ -name "*.log"  | xargs cp -t ../../{{Dest_dir}}/fio/logs)
     - name: removing fio_log
       shell: rm -rf ../../{{Dest_dir}}/fio/fio_temp
 

diff --git a/benchmarks/playbooks/iperf.yaml b/benchmarks/playbooks/iperf.yaml
index fdf22c9..8f6d9cc 100644 (file)
--- a/benchmarks/playbooks/iperf.yaml
+++ b/benchmarks/playbooks/iperf.yaml
@@ -111,15 +111,15 @@
         rolename: "{{role}}"
         when: role is defined
     - name: extracting_json
-      shell: ( find  ../../{{Dest_dir}}/iperf/iperf_temp/ -name "*.json" | xargs cp -t ../../{{Dest_dir}}/iperf/)
+      shell: (find  ../../{{Dest_dir}}/iperf/iperf_temp/ -name "*.json" | xargs cp -t ../../{{Dest_dir}}/iperf/)
       when: rolename == "2-host"
     - name: making_logs_folder
       shell: mkdir -p ../../{{Dest_dir}}/iperf/logs
     - name: extracting_log
-      shell: ( find ../../{{Dest_dir}}/iperf/iperf_temp/ -name "*.log"  | xargs cp -t ../../{{Dest_dir}}/iperf/logs)
+      shell: (find ../../{{Dest_dir}}/iperf/iperf_temp/ -name "*.log"  | xargs cp -t ../../{{Dest_dir}}/iperf/logs)
       when: rolename == "2-host"
     - name: removing iperf_raw file
       shell: rm -rf ../../{{Dest_dir}}/iperf/iperf_raw.json
       when: rolename == "2-host"
     - name: removing iperf_temp
-      shell: rm -rf ../../{{Dest_dir}}/iperf/iperf_temp
\ No newline at end of file
+      shell: rm -rf ../../{{Dest_dir}}/iperf/iperf_temp

diff --git a/benchmarks/playbooks/ramspeed.yaml b/benchmarks/playbooks/ramspeed.yaml
index 3ca4b14..365251b 100644 (file)
--- a/benchmarks/playbooks/ramspeed.yaml
+++ b/benchmarks/playbooks/ramspeed.yaml
@@ -67,10 +67,10 @@
    connection: local
    tasks:
     - name: extracting_json
-      shell: ( find  ../../{{Dest_dir}}/ramspeed/ramspeed_temp/ -name "*.json" | xargs cp -t ../../{{Dest_dir}}/ramspeed/)
+      shell: (find  ../../{{Dest_dir}}/ramspeed/ramspeed_temp/ -name "*.json" | xargs cp -t ../../{{Dest_dir}}/ramspeed/)
     - name: making_logs_folder
       shell: mkdir -p ../../{{Dest_dir}}/ramspeed/logs
     - name: extracting_log
-      shell: ( find ../../{{Dest_dir}}/ramspeed/ramspeed_temp/ -name "*.log"  | xargs cp -t ../../{{Dest_dir}}/ramspeed/logs)
+      shell: (find ../../{{Dest_dir}}/ramspeed/ramspeed_temp/ -name "*.log"  | xargs cp -t ../../{{Dest_dir}}/ramspeed/logs)
     - name: removing ramspeed_log
       shell: rm -rf ../../{{Dest_dir}}/ramspeed/ramspeed_temp

diff --git a/benchmarks/playbooks/ssl.yaml b/benchmarks/playbooks/ssl.yaml
index 92f81e5..75379d4 100644 (file)
--- a/benchmarks/playbooks/ssl.yaml
+++ b/benchmarks/playbooks/ssl.yaml
@@ -77,10 +77,10 @@
    sudo: no
    tasks:
     - name: extracting_json
-      shell: ( find  ../../{{Dest_dir}}/ssl/ssl_temp/ -name "*.json" | xargs cp -t ../../{{Dest_dir}}/ssl/)
+      shell: (find  ../../{{Dest_dir}}/ssl/ssl_temp/ -name "*.json" | xargs cp -t ../../{{Dest_dir}}/ssl/)
     - name: making_logs_folder
       shell: mkdir -p ../../{{Dest_dir}}/ssl/logs
     - name: extracting_log
-      shell: ( find ../../{{Dest_dir}}/ssl/ssl_temp/ -name "*.log"  | xargs cp -t ../../{{Dest_dir}}/ssl/logs)
+      shell: (find ../../{{Dest_dir}}/ssl/ssl_temp/ -name "*.log"  | xargs cp -t ../../{{Dest_dir}}/ssl/logs)
     - name: removing ssl_temp
       shell: rm -rf ../../{{Dest_dir}}/ssl/ssl_temp

diff --git a/benchmarks/playbooks/whetstone.yaml b/benchmarks/playbooks/whetstone.yaml
index 847474f..bcbccf3 100644 (file)
--- a/benchmarks/playbooks/whetstone.yaml
+++ b/benchmarks/playbooks/whetstone.yaml
@@ -72,10 +72,10 @@
    connection: local
    tasks:
     - name: extracting_json
-      shell: ( find  ../../{{Dest_dir}}/whetstone/whetstone_temp/ -name "*.json" | xargs cp -t ../../{{Dest_dir}}/whetstone/)
+      shell: (find  ../../{{Dest_dir}}/whetstone/whetstone_temp/ -name "*.json" | xargs cp -t ../../{{Dest_dir}}/whetstone/)
     - name: making_logs_folder
       shell: mkdir -p ../../{{Dest_dir}}/whetstone/logs
     - name: extracting_log
-      shell: ( find ../../{{Dest_dir}}/whetstone/whetstone_temp/ -name "*.log"  | xargs cp -t ../../{{Dest_dir}}/whetstone/logs)
+      shell: (find ../../{{Dest_dir}}/whetstone/whetstone_temp/ -name "*.log"  | xargs cp -t ../../{{Dest_dir}}/whetstone/logs)
     - name: removing whetstone_temp 
       shell: rm -rf ../../{{Dest_dir}}/whetstone/whetstone_temp