From 971a7c98515a9d83661f5e423f7e8390f35dca59 Mon Sep 17 00:00:00 2001 From: MofassirArif Date: Thu, 21 Jan 2016 06:42:23 -0800 Subject: bug fix: result collection bug fix for docker images Change-Id: Ia4ea09b90c7a4f4e3699af456c6d66e85661cc0b Signed-off-by: MofassirArif --- benchmarks/playbooks/cachebench.yaml | 2 +- benchmarks/playbooks/dhrystone.yaml | 28 ++++++++++++++-------------- benchmarks/playbooks/dpi.yaml | 26 +++++++++++++------------- benchmarks/playbooks/fio.yaml | 16 ++++++++-------- benchmarks/playbooks/iperf.yaml | 30 +++++++++++++++--------------- benchmarks/playbooks/netperf.yaml | 28 ++++++++++++++-------------- benchmarks/playbooks/pktgen.yaml | 10 +++++----- benchmarks/playbooks/ramspeed.yaml | 24 ++++++++++++------------ benchmarks/playbooks/ssl.yaml | 30 ++++++++++++++++-------------- benchmarks/playbooks/whetstone.yaml | 24 ++++++++++++------------ 10 files changed, 110 insertions(+), 108 deletions(-) (limited to 'benchmarks') diff --git a/benchmarks/playbooks/cachebench.yaml b/benchmarks/playbooks/cachebench.yaml index 510812bd..ebd0e172 100644 --- a/benchmarks/playbooks/cachebench.yaml +++ b/benchmarks/playbooks/cachebench.yaml @@ -33,6 +33,6 @@ shell: (cd /root/results/; find . -maxdepth 1 -type f) | cut -d'/' -f2 register: files_to_copy - name: copy results - fetch: src=/root/results/{{item}} dest=../../{{Dest_dir}}/cachebench + fetch: src=/root/results/{{item}} dest={{workingdir}}/{{Dest_dir}}/cachebench with_items: files_to_copy.stdout_lines diff --git a/benchmarks/playbooks/dhrystone.yaml b/benchmarks/playbooks/dhrystone.yaml index 8144cc01..c3cfb333 100644 --- a/benchmarks/playbooks/dhrystone.yaml +++ b/benchmarks/playbooks/dhrystone.yaml @@ -2,10 +2,10 @@ connection: local tasks: - name: making dhrystone directory - file: path=../../{{Dest_dir}}/dhrystone/dhrystone_temp state=directory + file: path={{workingdir}}/{{Dest_dir}}/dhrystone/dhrystone_temp state=directory - name: making temporary dhrystone directory - file: path=../../{{Dest_dir}}/dhrystone/dhrystone_temp state=directory - + file: path={{workingdir}}/{{Dest_dir}}/dhrystone/dhrystone_temp state=directory + - hosts: "{{role}}" tasks: @@ -15,7 +15,7 @@ - name: cleaning tempT shell: rm -rf $HOME/tempT - name: cleaning_qtip_result - shell: rm -rf $HOME/qtip_result + shell: rm -rf $HOME/qtip_result - name: make directory shell: mkdir $HOME/qtip_result - include: ./sys_info_pbook.yaml @@ -44,7 +44,7 @@ - name: copying consolidated report script copy: src=./result_transform/final_report.py dest={{home_dir.stdout}}/qtip_result/ - name: making consolidated report - shell: cd $HOME/qtip_result && python final_report.py Dhrystone + shell: cd $HOME/qtip_result && python final_report.py Dhrystone - name: making directory file: path={{home_dir.stdout}}/qtip_result/log state=directory - name: copying result to temp directory @@ -53,15 +53,15 @@ shell: (cd $HOME/qtip_result/; find . -maxdepth 1 -name "*.json") | cut -d'/' -f2 register: files_to_copy - name: copy results - fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest=../../{{Dest_dir}}/dhrystone/dhrystone_temp - with_items: files_to_copy.stdout_lines + fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/dhrystone/dhrystone_temp + with_items: files_to_copy.stdout_lines - name: registering log files shell: (cd $HOME/qtip_result/log/; find . -maxdepth 1 -name "*.log") | cut -d'/' -f2 register: copy_log_results - name: copying log results - fetch: src={{home_dir.stdout}}/qtip_result/log/{{item}} dest=../../{{Dest_dir}}/dhrystone/dhrystone_temp + fetch: src={{home_dir.stdout}}/qtip_result/log/{{item}} dest={{workingdir}}/{{Dest_dir}}/dhrystone/dhrystone_temp with_items: copy_log_results.stdout_lines - + - name: cleaning tempT shell: rm -rf $HOME/tempT - name: cleaning_qtip_result @@ -72,13 +72,13 @@ connection: local tasks: - name: extracting_json - shell: (find ../../{{Dest_dir}}/dhrystone/dhrystone_temp/ -name "*.json" | xargs cp -t ../../{{Dest_dir}}/dhrystone/) + shell: ( find {{workingdir}}/{{Dest_dir}}/dhrystone/dhrystone_temp/ -name "*.json" | xargs cp -t {{workingdir}}/{{Dest_dir}}/dhrystone/) - name: making_logs_folder - shell: mkdir -p ../../{{Dest_dir}}/dhrystone/logs + shell: mkdir -p {{workingdir}}/{{Dest_dir}}/dhrystone/logs - name: extracting_log - 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 + shell: ( find {{workingdir}}/{{Dest_dir}}/dhrystone/dhrystone_temp/ -name "*.log" | xargs cp -t {{workingdir}}/{{Dest_dir}}/dhrystone/logs) + - name: removing dhrystone_temp + shell: rm -rf {{workingdir}}/{{Dest_dir}}/dhrystone/dhrystone_temp # - name: cleaning_2 # file: path=/root/tempT state=absent # file: path=/root/qtip_result state=absent diff --git a/benchmarks/playbooks/dpi.yaml b/benchmarks/playbooks/dpi.yaml index 029133d0..19ab30ce 100644 --- a/benchmarks/playbooks/dpi.yaml +++ b/benchmarks/playbooks/dpi.yaml @@ -1,14 +1,14 @@ - hosts: 127.0.0.1 connection: local - tasks: + tasks: - name: making dpi directory - file: path=../../{{Dest_dir}}/dpi state=directory + file: path={{workingdir}}/{{Dest_dir}}/dpi state=directory - name: making temporary whetstone directory - file: path=../../{{Dest_dir}}/dpi/dpi_temp state=directory - + file: path={{workingdir}}/{{Dest_dir}}/dpi/dpi_temp state=directory + - hosts: "{{role}}" tasks: - + - name: checking_home directory shell: echo $HOME register: home_dir @@ -40,14 +40,14 @@ - name: Fetching Test_pcap file shell: cd $HOME/tempD/nDPI/example && wget https://www.dropbox.com/s/ne64u7jykuw2uu5/test.pcap - name: fetch Averaging script - copy: src=./result_transform/dpi/dpi_average.sh dest={{home_dir.stdout}}/tempD/nDPI/example mode=777 + copy: src=./result_transform/dpi/dpi_average.sh dest={{home_dir.stdout}}/tempD/nDPI/example mode=777 - name: Run nDPI benchmark shell: cd $HOME/tempD/nDPI/example && ./dpi_average.sh - name: copy result to temp_direc shell: cp $HOME/tempD/nDPI/example/dpi_dump.txt $HOME/qtip_result - name: fetch dpi result transform script copy: src=./result_transform/dpi/dpi_transform.py dest={{home_dir.stdout}}/qtip_result - + - name: Transforming results shell: cd $HOME/qtip_result && python dpi_transform.py - name: copy report formation script @@ -58,13 +58,13 @@ shell: (cd $HOME/qtip_result/; find . -maxdepth 1 -name "*.json") | cut -d'/' -f2 register: files_to_copy - name: copy results - fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest=../../{{Dest_dir}}/dpi/dpi_temp + fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/dpi/dpi_temp with_items: files_to_copy.stdout_lines - name: registering log files shell: (cd $HOME/qtip_result/; find . -maxdepth 1 -name "*.log") | cut -d'/' -f2 register: copy_log_results - name: copying log results - fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest=../../{{Dest_dir}}/dpi/dpi_temp + fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/dpi/dpi_temp with_items: copy_log_results.stdout_lines # - name: cleaning tempD @@ -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 {{workingdir}}/{{Dest_dir}}/dpi/dpi_temp/ -name "*.json" | xargs cp -t {{workingdir}}/{{Dest_dir}}/dpi/) - name: making_logs_folder - shell: mkdir -p ../../{{Dest_dir}}/dpi/logs + shell: mkdir -p {{workingdir}}/{{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 {{workingdir}}/{{Dest_dir}}/dpi/dpi_temp/ -name "*.log" | xargs cp -t {{workingdir}}/{{Dest_dir}}/dpi/logs) - name: removing dpi_temp - shell: rm -rf ../../{{Dest_dir}}/dpi/dpi_temp + shell: rm -rf {{workingdir}}/{{Dest_dir}}/dpi/dpi_temp diff --git a/benchmarks/playbooks/fio.yaml b/benchmarks/playbooks/fio.yaml index f1d54fde..7162dc3b 100644 --- a/benchmarks/playbooks/fio.yaml +++ b/benchmarks/playbooks/fio.yaml @@ -2,9 +2,9 @@ connection: local tasks: - name: making fio directory - file: path=../../{{Dest_dir}}/fio state=directory + file: path={{workingdir}}/{{Dest_dir}}/fio state=directory - name: making temporary fio directory - file: path=../../{{Dest_dir}}/fio/fio_temp state=directory + file: path={{workingdir}}/{{Dest_dir}}/fio/fio_temp state=directory - hosts: "{{role}}" @@ -54,24 +54,24 @@ shell: (cd $HOME/qtip_result/; find . -maxdepth 1 -name "*.json") | cut -d'/' -f2 register: files_to_copy - name: copy results - fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest=../../{{Dest_dir}}/fio/fio_temp + fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/fio/fio_temp with_items: files_to_copy.stdout_lines - name: registering log files shell: (cd $HOME/qtip_result/; find . -maxdepth 1 -name "*.log") | cut -d'/' -f2 register: copy_log_results - name: copying log results - fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest=../../{{Dest_dir}}/fio/fio_temp + fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/fio/fio_temp with_items: copy_log_results.stdout_lines - hosts: 127.0.0.1 connection: local tasks: - name: extracting_json - shell: (find ../../{{Dest_dir}}/fio/fio_temp/ -name "*.json" | xargs cp -t ../../{{Dest_dir}}/fio/) + shell: ( find {{workingdir}}/{{Dest_dir}}/fio/fio_temp/ -name "*.json" | xargs cp -t {{workingdir}}/{{Dest_dir}}/fio/) - name: making_logs_folder - shell: mkdir -p ../../{{Dest_dir}}/fio/logs + shell: mkdir -p {{workingdir}}/{{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 {{workingdir}}/{{Dest_dir}}/fio/fio_temp/ -name "*.log" | xargs cp -t {{workingdir}}/{{Dest_dir}}/fio/logs) - name: removing fio_log - shell: rm -rf ../../{{Dest_dir}}/fio/fio_temp + shell: rm -rf {{workingdir}}/{{Dest_dir}}/fio/fio_temp diff --git a/benchmarks/playbooks/iperf.yaml b/benchmarks/playbooks/iperf.yaml index 8f6d9cc2..d6bc00ed 100644 --- a/benchmarks/playbooks/iperf.yaml +++ b/benchmarks/playbooks/iperf.yaml @@ -1,14 +1,14 @@ - hosts: 127.0.0.1 connection: local - tasks: + tasks: - name: getting directory shell: echo $PWD register: qtip_dir - name: making Iperf directory - file: path=../../{{Dest_dir}}/iperf state=directory + file: path={{workingdir}}/{{Dest_dir}}/iperf state=directory - name: making temporary iperf directory - file: path=../../{{Dest_dir}}/iperf/iperf_temp state=directory + file: path={{workingdir}}/{{Dest_dir}}/iperf/iperf_temp state=directory - hosts: "{{role}}" @@ -53,7 +53,7 @@ when: iptable_entry != '' and installertype == 'fuel' - name: Installing IPERF when Ubuntu shell: apt-get install iperf3 -y - when: ansible_os_family == "Debian" and rolename == '1-server' + when: ansible_os_family == "Debian" and rolename == '1-server' - name: Installing Iperf3 shell: yum install iperf3 -y when: ansible_os_family == "RedHat" @@ -65,13 +65,13 @@ - name: Running Iperf on Host shell: iperf3 --time {{duration}} -b {{bandwidthGbps}}G -c {{ip1}} -J -O10 >> ./qtip_result/iperf_raw.json ignore_errors: yes - with_items: + with_items: - "{{ip1}}" when: rolename == "2-host" and "{{privateip1}}" == "NONE" - name: Running Iperf on Host shell: iperf3 --time {{duration}} -b{{bandwidthGbps}}G -c {{privateip1}} -J -O10 >> ./qtip_result/iperf_raw.json ignore_errors: yes - with_items: + with_items: - "{{ip1}}" when: rolename == "2-host" and "{{privateip1}}" != "NONE" - name: Fetching result transformation script @@ -83,14 +83,14 @@ copy: src=./result_transform/final_report.py dest={{home_dir.stdout}}/qtip_result when: rolename =="2-host" and "{{ip2}}" == '' - name: consolidating report - shell: cd $HOME/qtip_result && python final_report.py IPERF + shell: cd $HOME/qtip_result && python final_report.py IPERF when: rolename =="2-host" and "{{ip2}}" == '' - - name: Files to Copy + - name: Files to Copy 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=../../{{Dest_dir}}/iperf/iperf_temp + fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/iperf/iperf_temp with_items: files_to_copy.stdout_lines when: rolename =="2-host" and "{{ip2}}" == '' - name: registering log files @@ -98,7 +98,7 @@ register: copy_log_results when: rolename =="2-host" and "{{ip2}}" == '' - name: copying log results - fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest=../../{{Dest_dir}}/iperf/iperf_temp + fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/iperf/iperf_temp with_items: copy_log_results.stdout_lines when: rolename =="2-host" and "{{ip2}}" == '' @@ -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 {{workingdir}}/{{Dest_dir}}/iperf/iperf_temp/ -name "*.json" | xargs cp -t {{workingdir}}/{{Dest_dir}}/iperf/) when: rolename == "2-host" - name: making_logs_folder - shell: mkdir -p ../../{{Dest_dir}}/iperf/logs + shell: mkdir -p {{workingdir}}/{{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 {{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 ../../{{Dest_dir}}/iperf/iperf_raw.json + shell: rm -rf {{workingdir}}/{{Dest_dir}}/iperf/iperf_raw.json when: rolename == "2-host" - name: removing iperf_temp - shell: rm -rf ../../{{Dest_dir}}/iperf/iperf_temp + shell: rm -rf {{workingdir}}/{{Dest_dir}}/iperf/iperf_temp \ No newline at end of file diff --git a/benchmarks/playbooks/netperf.yaml b/benchmarks/playbooks/netperf.yaml index 3292f060..12943bcc 100644 --- a/benchmarks/playbooks/netperf.yaml +++ b/benchmarks/playbooks/netperf.yaml @@ -1,14 +1,14 @@ - hosts: 127.0.0.1 connection: local - tasks: + tasks: - name: getting directory shell: echo $PWD register: qtip_dir - name: making Netperf directory - file: path=../../{{Dest_dir}}/netperf state=directory + file: path={{workingdir}}/{{Dest_dir}}/netperf state=directory - name: making temporary netperf directory - file: path=../../{{Dest_dir}}/netperf/netperf_temp state=directory + file: path={{workingdir}}/{{Dest_dir}}/netperf/netperf_temp state=directory - hosts: "{{role}}" @@ -17,7 +17,7 @@ set_fact: rolename: "{{role}}" when: role is defined - + - name: Get Hostname shell: echo $HOSTNAME register: hostID @@ -32,7 +32,7 @@ shell: mkdir $HOME/netperf - name: making results temporary directory shell: mkdir $HOME/qtip_result - + - name: Fetching netperf shell: wget ftp://ftp.netperf.org/netperf/netperf-2.7.0.tar.gz when: ansible_os_family == "RedHat" @@ -41,26 +41,26 @@ - name: configuring netperf shell: cd $HOME/netperf-2.7.0 && ./configure - name: Making Netperf - shell: cd $HOME/netperf-2.7.0 && make + shell: cd $HOME/netperf-2.7.0 && make - name: Installing Netperf shell: cd $HOME/netperf-2.7.0 && make install - + - name: Running netperf on server shell: /usr/local/bin/netserver -p 4000 when: rolename == "1-server" - + - name: Running netperf on Host shell: /usr/local/bin/netperf -H {{privateip1}} -p 4000 -l {{duration}} -t {{teststream}} -fG >> ./qtip_result/server{{hostID.stdout}}-{{item}}.json ignore_errors: yes - with_items: + with_items: - "{{ip1}}" when: rolename == "2-host" and "{{ip2}}" == '' - - - name: Files to Copy + + - name: Files to Copy shell: (cd $HOME/qtip_result/; find . -maxdepth 1 -name "*.json") | cut -d'/' -f2 register: files_to_copy - name: copy results - fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest=../../{{Dest_dir}}/netperf/netperf_temp + fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/netperf/netperf_temp with_items: files_to_copy.stdout_lines - hosts: 127.0.0.1 connection: local @@ -70,7 +70,7 @@ rolename: "{{role}}" when: role is defined - name: extracting_json - shell: ( find ../../{{Dest_dir}}/netperf/netperf_temp/ -name "*.json" | xargs cp -t ../../{{Dest_dir}}/netperf/) + shell: ( find {{workingdir}}/{{Dest_dir}}/netperf/netperf_temp/ -name "*.json" | xargs cp -t {{workingdir}}/{{Dest_dir}}/netperf/) when: rolename == "2-host" - name: removing netperf_temp - shell: rm -rf ../../{{Dest_dir}}/netperf/netperf_temp \ No newline at end of file + shell: rm -rf {{workingdir}}/{{Dest_dir}}/netperf/netperf_temp \ No newline at end of file diff --git a/benchmarks/playbooks/pktgen.yaml b/benchmarks/playbooks/pktgen.yaml index 04a0066e..466fb8e9 100644 --- a/benchmarks/playbooks/pktgen.yaml +++ b/benchmarks/playbooks/pktgen.yaml @@ -1,14 +1,14 @@ - hosts: 127.0.0.1 connection: local - tasks: + tasks: - name: getting directory shell: echo $PWD register: qtip_dir - name: making pktgen directory - file: path=../../{{Dest_dir}}/pktgen state=directory + file: path={{workingdir}}/{{Dest_dir}}/pktgen state=directory - name: making temporary pktgen directory - file: path=../../{{Dest_dir}}/pktgen/pktgen_temp state=directory + file: path={{workingdir}}/{{Dest_dir}}/pktgen/pktgen_temp state=directory - hosts: "{{role}}" @@ -17,7 +17,7 @@ set_fact: rolename: "{{role}}" when: role is defined - + - name: IPTABLE Setup shell: iptables -F when: rolename == '1-server' @@ -30,7 +30,7 @@ - hosts: "{{role}}" tasks: - name: Rolename - set_fact: + set_fact: rolename: "{{role}}" when: role is defined - name: Get server packetsize diff --git a/benchmarks/playbooks/ramspeed.yaml b/benchmarks/playbooks/ramspeed.yaml index 365251b0..1d45f028 100644 --- a/benchmarks/playbooks/ramspeed.yaml +++ b/benchmarks/playbooks/ramspeed.yaml @@ -2,14 +2,14 @@ connection: local tasks: - name: making ramspeed directory - file: path=../../{{Dest_dir}}/ramspeed state=directory + file: path={{workingdir}}/{{Dest_dir}}/ramspeed state=directory - name: making temporary ramspeed directory - file: path=../../{{Dest_dir}}/ramspeed/ramspeed_temp state=directory - + file: path={{workingdir}}/{{Dest_dir}}/ramspeed/ramspeed_temp state=directory + - hosts: "{{role}}" tasks: - + - name: checking_home directory shell: echo $HOME register: home_dir @@ -18,9 +18,9 @@ - name: cleaning previous results shell: rm -rf $HOME/qtip_result - name: making ramspeed temporary directory - shell: mkdir $HOME/ramspeed + shell: mkdir $HOME/ramspeed - name: making results temporary directory - shell: mkdir $HOME/qtip_result + shell: mkdir $HOME/qtip_result - include: ./sys_info_pbook.yaml vars: network: false @@ -54,23 +54,23 @@ shell: (cd $HOME/qtip_result/; find . -maxdepth 1 -name "*.json") | cut -d'/' -f2 register: files_to_copy - name: copy results - fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest=../../{{Dest_dir}}/ramspeed/ramspeed_temp + fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/ramspeed/ramspeed_temp with_items: files_to_copy.stdout_lines - name: registering log files shell: (cd $HOME/qtip_result/; find . -maxdepth 1 -name "*.log") | cut -d'/' -f2 register: copy_log_results - name: copying log results - fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest=../../{{Dest_dir}}/ramspeed/ramspeed_temp + fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/ramspeed/ramspeed_temp with_items: copy_log_results.stdout_lines - hosts: 127.0.0.1 connection: local tasks: - name: extracting_json - shell: (find ../../{{Dest_dir}}/ramspeed/ramspeed_temp/ -name "*.json" | xargs cp -t ../../{{Dest_dir}}/ramspeed/) + shell: ( find {{workingdir}}/{{Dest_dir}}/ramspeed/ramspeed_temp/ -name "*.json" | xargs cp -t {{workingdir}}/{{Dest_dir}}/ramspeed/) - name: making_logs_folder - shell: mkdir -p ../../{{Dest_dir}}/ramspeed/logs + shell: mkdir -p {{workingdir}}/{{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 {{workingdir}}/{{Dest_dir}}/ramspeed/ramspeed_temp/ -name "*.log" | xargs cp -t {{workingdir}}/{{Dest_dir}}/ramspeed/logs) - name: removing ramspeed_log - shell: rm -rf ../../{{Dest_dir}}/ramspeed/ramspeed_temp + shell: rm -rf {{workingdir}}/{{Dest_dir}}/ramspeed/ramspeed_temp diff --git a/benchmarks/playbooks/ssl.yaml b/benchmarks/playbooks/ssl.yaml index 75379d48..9416bb38 100644 --- a/benchmarks/playbooks/ssl.yaml +++ b/benchmarks/playbooks/ssl.yaml @@ -4,13 +4,13 @@ sudo: no tasks: - name: making ssl directory - file: path=../../{{Dest_dir}}/ssl state=directory + file: path={{workingdir}}/{{Dest_dir}}/ssl state=directory - name: making temporary ssl directory - file: path=../../{{Dest_dir}}/ssl/ssl_temp state=directory + file: path={{workingdir}}/{{Dest_dir}}/ssl/ssl_temp state=directory - hosts: "{{role}}" remote_user: root tasks: - + - name: checking_home directory shell: echo $HOME register: home_dir @@ -19,9 +19,9 @@ - name: cleaning previous results shell: rm -rf $HOME/qtip_result - name: making OpenSSL temporary directory - shell: mkdir $HOME/Open_SSL + shell: mkdir $HOME/Open_SSL - name: making results temporary directory - shell: mkdir $HOME/qtip_result + shell: mkdir $HOME/qtip_result - include: ./sys_info_pbook.yaml vars: network: false @@ -37,8 +37,8 @@ shell: cd $HOME/Open_SSL/ && tar -zxvf openssl-1.0.2e.tar.gz - name: configure shell: cd $HOME/Open_SSL/openssl-1.0.2e && ./config - - name: make - shell: cd $HOME/Open_SSL/openssl-1.0.2e && make + - name: make + shell: cd $HOME/Open_SSL/openssl-1.0.2e && make - name: make install shell: cd $HOME/Open_SSL/openssl-1.0.2e && make install - name: Benchmarking RSA signatures @@ -57,16 +57,16 @@ shell: (cd $HOME/qtip_result/; find . -maxdepth 1 -name "*.json") | cut -d'/' -f2 register: files_to_copy - name: copy results - fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest=../../{{Dest_dir}}/ssl/ssl_temp + fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/ssl/ssl_temp with_items: files_to_copy.stdout_lines - name: registering log files shell: (cd $HOME/qtip_result/; find . -maxdepth 1 -name "*.log") | cut -d'/' -f2 register: copy_log_results - name: copying log results - fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest=../../{{Dest_dir}}/ssl/ssl_temp + fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/ssl/ssl_temp with_items: copy_log_results.stdout_lines - + # - name: copy results # fetch: src=/root/results/{{item}} dest={{Dest_dir}}/ssl # with_items: files_to_copy.stdout_lines @@ -76,11 +76,13 @@ remote_user: '{{ ansible_env.USER }}' sudo: no tasks: + - name: echo + shell: echo $PWD - name: extracting_json - shell: (find ../../{{Dest_dir}}/ssl/ssl_temp/ -name "*.json" | xargs cp -t ../../{{Dest_dir}}/ssl/) + shell: ( find {{workingdir}}/{{Dest_dir}}/ssl/ssl_temp/ -name "*.json" | xargs cp -t {{workingdir}}/{{Dest_dir}}/ssl/) - name: making_logs_folder - shell: mkdir -p ../../{{Dest_dir}}/ssl/logs + shell: mkdir -p {{workingdir}}/{{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 {{workingdir}}/{{Dest_dir}}/ssl/ssl_temp/ -name "*.log" | xargs cp -t {{workingdir}}/{{Dest_dir}}/ssl/logs) - name: removing ssl_temp - shell: rm -rf ../../{{Dest_dir}}/ssl/ssl_temp + shell: rm -rf {{workingdir}}/{{Dest_dir}}/ssl/ssl_temp diff --git a/benchmarks/playbooks/whetstone.yaml b/benchmarks/playbooks/whetstone.yaml index bcbccf3e..599b98f3 100644 --- a/benchmarks/playbooks/whetstone.yaml +++ b/benchmarks/playbooks/whetstone.yaml @@ -2,10 +2,10 @@ connection: local tasks: - name: making whetstone directory - file: path=../../{{Dest_dir}}/whetstone state=directory + file: path={{workingdir}}/{{Dest_dir}}/whetstone state=directory - name: making temporary whetstone directory - file: path=../../{{Dest_dir}}/whetstone/whetstone_temp state=directory - + file: path={{workingdir}}/{{Dest_dir}}/whetstone/whetstone_temp state=directory + - hosts: "{{role}}" tasks: @@ -45,7 +45,7 @@ - name: copying consolidated report script copy: src=./result_transform/final_report.py dest={{home_dir.stdout}}/qtip_result/ - name: making consolidated report - shell: cd $HOME/qtip_result && python final_report.py Whetstone + shell: cd $HOME/qtip_result && python final_report.py Whetstone - name: making directory file: path={{home_dir.stdout}}/qtip_result/log state=directory - name: copying result to temp directory @@ -54,13 +54,13 @@ shell: (cd $HOME/qtip_result/; find . -maxdepth 1 -name "*.json") | cut -d'/' -f2 register: files_to_copy - name: copy results - fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest=../../{{Dest_dir}}/whetstone/whetstone_temp - with_items: files_to_copy.stdout_lines + fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/whetstone/whetstone_temp + with_items: files_to_copy.stdout_lines - name: registering log files shell: (cd $HOME/qtip_result/log/; find . -maxdepth 1 -name "*.log") | cut -d'/' -f2 register: copy_log_results - name: copying log results - fetch: src={{home_dir.stdout}}/qtip_result/log/{{item}} dest=../../{{Dest_dir}}/whetstone/whetstone_temp + fetch: src={{home_dir.stdout}}/qtip_result/log/{{item}} dest={{workingdir}}/{{Dest_dir}}/whetstone/whetstone_temp with_items: copy_log_results.stdout_lines - name: cleaning tempT shell: rm -rf $HOME/tempT @@ -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 {{workingdir}}/{{Dest_dir}}/whetstone/whetstone_temp/ -name "*.json" | xargs cp -t {{workingdir}}/{{Dest_dir}}/whetstone/) - name: making_logs_folder - shell: mkdir -p ../../{{Dest_dir}}/whetstone/logs + shell: mkdir -p {{workingdir}}/{{Dest_dir}}/whetstone/logs - name: extracting_log - 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 + shell: ( find {{workingdir}}/{{Dest_dir}}/whetstone/whetstone_temp/ -name "*.log" | xargs cp -t {{workingdir}}/{{Dest_dir}}/whetstone/logs) + - name: removing whetstone_temp + shell: rm -rf {{workingdir}}/{{Dest_dir}}/whetstone/whetstone_temp -- cgit 1.2.3-korg