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/dpi.yaml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'benchmarks/playbooks/dpi.yaml') 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 -- cgit 1.2.3-korg