diff options
| -rw-r--r-- | benchmarks/playbooks/cachebench.yaml | 23 | ||||
| -rw-r--r-- | benchmarks/playbooks/dhrystone.yaml | 28 | ||||
| -rw-r--r-- | benchmarks/playbooks/dpi.yaml | 24 | ||||
| -rw-r--r-- | benchmarks/playbooks/fio.yaml | 19 | ||||
| -rw-r--r-- | benchmarks/playbooks/git_proxy_pbook.yaml | 1 | ||||
| -rw-r--r-- | benchmarks/playbooks/iperf.yaml | 21 | ||||
| -rw-r--r-- | benchmarks/playbooks/netperf.yaml | 30 | ||||
| -rw-r--r-- | benchmarks/playbooks/pktgen.yaml | 15 | ||||
| -rw-r--r-- | benchmarks/playbooks/ramspeed.yaml | 19 | ||||
| -rw-r--r-- | benchmarks/playbooks/ssl.yaml | 27 | ||||
| -rw-r--r-- | benchmarks/playbooks/sys_info_pbook.yaml | 5 | ||||
| -rw-r--r-- | benchmarks/playbooks/whetstone.yaml | 17 | ||||
| -rw-r--r-- | func/env_setup.py | 2 | ||||
| -rw-r--r-- | tests/output/hosts | 2 |
14 files changed, 166 insertions, 67 deletions
diff --git a/benchmarks/playbooks/cachebench.yaml b/benchmarks/playbooks/cachebench.yaml index ebd0e172..ca9a709c 100644 --- a/benchmarks/playbooks/cachebench.yaml +++ b/benchmarks/playbooks/cachebench.yaml @@ -1,4 +1,3 @@ - - hosts: "{{ roles }}" tasks: @@ -7,32 +6,44 @@ shell: rm -rf /usr/share/doc/phoronix-test-suite/ shell: rm -rf /usr/share/phoronix-test-suite shell: rm -rf /root/photmp/ + - name: cleaning results file: path=/root/results state=absent + - name: make direc file: path=/root/photmp/ state=directory - - name: Fetch Phornonix + + - name: Fetch Phornonix shell: cd /root/photmp/ && wget https://www.dropbox.com/s/5kks513ozxy7vvs/phoronix-suite.tar.gz + - name: unarchive Phoronix shell: cd /root/photmp/ && tar -zxvf phoronix-suite.tar.gz + - name: Install Phornonix Dependencies shell: yum install php php-xml php-client php-process -y + - name: Install Phornonix - shell: cd /root/photmp/phoronix-test-suite-master/&&./install-sh + shell: cd /root/photmp/phoronix-test-suite-master/&&./install-sh + - name: batchSetup shell: phoronix-test-suite batch-setup + - name: install shell: phoronix-test-suite batch-install cachebench + - name: run - shell: phoronix-test-suite batch-run cachebench + shell: phoronix-test-suite batch-run cachebench + - name: making directory file: path=/root/results state=directory + - name: copying result to temp directory shell: cp -r /var/lib/phoronix-test-suite/test-results/* /root/results/ + - name: registering files 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={{workingdir}}/{{Dest_dir}}/cachebench - with_items: files_to_copy.stdout_lines - + with_items: "{{files_to_copy.stdout_lines}}" diff --git a/benchmarks/playbooks/dhrystone.yaml b/benchmarks/playbooks/dhrystone.yaml index 82b24dd1..d4fe07ea 100644 --- a/benchmarks/playbooks/dhrystone.yaml +++ b/benchmarks/playbooks/dhrystone.yaml @@ -1,23 +1,27 @@ - - hosts: 127.0.0.1 + - hosts: localhost connection: local + gather_facts: no + tasks: - name: making dhrystone directory - file: path={{workingdir}}/{{Dest_dir}}/dhrystone/dhrystone_temp state=directory + file: path={{workingdir}}/{{Dest_dir}}/dhrystone state=directory + - name: making temporary dhrystone directory file: path={{workingdir}}/{{Dest_dir}}/dhrystone/dhrystone_temp state=directory - hosts: "{{role}}" become: yes remote_user: "{{username}}" + tasks: - - name: checking_home directory - shell: sudo echo $HOME + - name: checking home directory + shell: echo $HOME register: home_dir - name: cleaning tempT shell: sudo rm -rf $HOME/tempT - - name: cleaning_qtip_result + - name: cleaning qtip_result shell: sudo rm -rf $HOME/qtip_result - name: make directory @@ -40,7 +44,8 @@ - include: ./git_proxy_pbook.yaml - name: Clone unixbench - shell: git clone https://github.com/kdlucas/byte-unixbench.git $HOME/tempT + git: repo=https://github.com/kdlucas/byte-unixbench.git + dest=$HOME/tempT - name: make shell: sudo make --directory $HOME/tempT/UnixBench/ @@ -77,7 +82,7 @@ - name: copy results fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/dhrystone/dhrystone_temp - with_items: files_to_copy.stdout_lines + 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 @@ -85,7 +90,7 @@ - name: copying log results fetch: src={{home_dir.stdout}}/qtip_result/log/{{item}} dest={{workingdir}}/{{Dest_dir}}/dhrystone/dhrystone_temp - with_items: copy_log_results.stdout_lines + with_items: "{{copy_log_results.stdout_lines}}" - name: cleaning tempT shell: sudo rm -rf $HOME/tempT @@ -94,14 +99,19 @@ shell: sudo rm -rf $HOME/qtip_result - - hosts: 127.0.0.1 + - hosts: localhost connection: local + gather_facts: no + tasks: - name: extracting_json shell: ( find {{workingdir}}/{{Dest_dir}}/dhrystone/dhrystone_temp/ -name "*.json" | xargs cp -t {{workingdir}}/{{Dest_dir}}/dhrystone/) + - name: making_logs_folder shell: mkdir -p {{workingdir}}/{{Dest_dir}}/dhrystone/logs + - name: extracting_log 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 diff --git a/benchmarks/playbooks/dpi.yaml b/benchmarks/playbooks/dpi.yaml index f4e6de8d..6dae0869 100644 --- a/benchmarks/playbooks/dpi.yaml +++ b/benchmarks/playbooks/dpi.yaml @@ -1,19 +1,23 @@ - - hosts: 127.0.0.1 + - hosts: localhost connection: local + gather_facts: no + tasks: - name: making dpi directory file: path={{workingdir}}/{{Dest_dir}}/dpi state=directory + - name: making temporary whetstone directory file: path={{workingdir}}/{{Dest_dir}}/dpi/dpi_temp state=directory - hosts: "{{role}}" become: yes remote_user: "{{username}}" + tasks: - name: echo shell: echo $USER - - name: checking_home directory + - name: checking home directory shell: echo $HOME register: home_dir @@ -46,7 +50,8 @@ - include: ./git_proxy_pbook.yaml - name: Clone nDPI - shell: cd $HOME/tempD && git clone https://github.com/ntop/nDPI.git + git: repo=https://github.com/ntop/nDPI.git + dest=$HOME/tempD - name: autogen shell: cd $HOME/tempD/nDPI && sudo ./autogen.sh @@ -55,7 +60,7 @@ shell: cd $HOME/tempD/nDPI && sudo ./configure - name: make - shell: cd $HOME/tempD/nDPI && sudo make + shell: cd $HOME/tempD/nDPI && sudo make - name: Fetching Test_pcap file shell: cd $HOME/tempD/nDPI/example && wget http://artifacts.opnfv.org/qtip/utilities/test.pcap @@ -87,7 +92,7 @@ - name: copy results fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/dpi/dpi_temp - with_items: files_to_copy.stdout_lines + with_items: "{{files_to_copy.stdout_lines}}" - name: registering log files shell: (cd $HOME/qtip_result/; find . -maxdepth 1 -name "*.log") | cut -d'/' -f2 @@ -95,16 +100,21 @@ - name: copying log results fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/dpi/dpi_temp - with_items: copy_log_results.stdout_lines + with_items: "{{copy_log_results.stdout_lines}}" - - hosts: 127.0.0.1 + - hosts: localhost connection: local + gather_facts: no + tasks: - name: extracting_json shell: ( find {{workingdir}}/{{Dest_dir}}/dpi/dpi_temp/ -name "*.json" | xargs cp -t {{workingdir}}/{{Dest_dir}}/dpi/) + - name: making_logs_folder shell: mkdir -p {{workingdir}}/{{Dest_dir}}/dpi/logs + - name: extracting_log 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 {{workingdir}}/{{Dest_dir}}/dpi/dpi_temp diff --git a/benchmarks/playbooks/fio.yaml b/benchmarks/playbooks/fio.yaml index 3de237f2..813dc411 100644 --- a/benchmarks/playbooks/fio.yaml +++ b/benchmarks/playbooks/fio.yaml @@ -1,8 +1,11 @@ - - hosts: 127.0.0.1 + - hosts: localhost connection: local + gather_facts: no + tasks: - name: making fio directory file: path={{workingdir}}/{{Dest_dir}}/fio state=directory + - name: making temporary fio directory file: path={{workingdir}}/{{Dest_dir}}/fio/fio_temp state=directory @@ -10,8 +13,9 @@ - hosts: "{{role}}" become: yes remote_user: "{{username}}" + tasks: - - name: checking_home directory + - name: checking home directory shell: echo $HOME register: home_dir @@ -72,7 +76,7 @@ - name: copy results fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/fio/fio_temp - with_items: files_to_copy.stdout_lines + with_items: "{{files_to_copy.stdout_lines}}" - name: registering log files shell: (cd $HOME/qtip_result/; find . -maxdepth 1 -name "*.log") | cut -d'/' -f2 @@ -80,17 +84,22 @@ - name: copying log results fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/fio/fio_temp - with_items: copy_log_results.stdout_lines + with_items: "{{copy_log_results.stdout_lines}}" - - hosts: 127.0.0.1 + - hosts: localhost connection: local + gather_facts: no + tasks: - name: extracting_json shell: ( find {{workingdir}}/{{Dest_dir}}/fio/fio_temp/ -name "*.json" | xargs cp -t {{workingdir}}/{{Dest_dir}}/fio/) + - name: making_logs_folder shell: mkdir -p {{workingdir}}/{{Dest_dir}}/fio/logs + - name: extracting_log 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 {{workingdir}}/{{Dest_dir}}/fio/fio_temp diff --git a/benchmarks/playbooks/git_proxy_pbook.yaml b/benchmarks/playbooks/git_proxy_pbook.yaml index 6d155a76..5cb6f450 100644 --- a/benchmarks/playbooks/git_proxy_pbook.yaml +++ b/benchmarks/playbooks/git_proxy_pbook.yaml @@ -1,4 +1,3 @@ - #git - name: set git proxy(http) shell: "git config --global http.proxy {{ http_proxy }}" diff --git a/benchmarks/playbooks/iperf.yaml b/benchmarks/playbooks/iperf.yaml index de1e5a4d..b6fd75c5 100644 --- a/benchmarks/playbooks/iperf.yaml +++ b/benchmarks/playbooks/iperf.yaml @@ -1,12 +1,15 @@ - - hosts: 127.0.0.1 + - hosts: localhost connection: local - tasks: + gather_facts: no + tasks: - name: getting directory shell: sudo echo $PWD register: qtip_dir + - name: making Iperf directory file: path={{workingdir}}/{{Dest_dir}}/iperf state=directory + - name: making temporary iperf directory file: path={{workingdir}}/{{Dest_dir}}/iperf/iperf_temp state=directory @@ -14,6 +17,7 @@ - hosts: "{{role}}" become: yes remote_user: "{{username}}" + tasks: - name: Rolename set_fact: @@ -31,7 +35,7 @@ - name: echo shell: echo index_var - - name: checking_home directory + - name: checking home directory shell: echo $HOME register: home_dir @@ -44,7 +48,7 @@ - name: making Iperf temporary directory shell: sudo mkdir $HOME/iperf - - name: making results temporary directory + - name: making results temporary directory shell: sudo mkdir $HOME/qtip_result - include: ./sys_proxy_pbook.yaml @@ -128,23 +132,30 @@ when: rolename =="2-host" and "{{ip2}}" == '' - - hosts: 127.0.0.1 + - hosts: localhost connection: local + gather_facts: no + tasks: - name: Rolename set_fact: rolename: "{{role}}" when: role is defined + - name: extracting_json 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 {{workingdir}}/{{Dest_dir}}/iperf/logs + - name: extracting_log 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 {{workingdir}}/{{Dest_dir}}/iperf/iperf_raw.json when: rolename == "2-host" + - name: removing iperf_temp shell: rm -rf {{workingdir}}/{{Dest_dir}}/iperf/iperf_temp diff --git a/benchmarks/playbooks/netperf.yaml b/benchmarks/playbooks/netperf.yaml index 30f4b574..a07752cb 100644 --- a/benchmarks/playbooks/netperf.yaml +++ b/benchmarks/playbooks/netperf.yaml @@ -1,12 +1,15 @@ - - hosts: 127.0.0.1 + - hosts: localhost connection: local - tasks: + gather_facts: no + tasks: - name: getting directory shell: echo $PWD register: qtip_dir + - name: making Netperf directory file: path={{workingdir}}/{{Dest_dir}}/netperf state=directory + - name: making temporary netperf directory file: path={{workingdir}}/{{Dest_dir}}/netperf/netperf_temp state=directory @@ -24,27 +27,36 @@ - name: Get Hostname shell: echo $HOSTNAME register: hostID - - name: checking_home directory + + - name: checking home directory shell: echo $HOME register: home_dir + - name: cleaning shell: rm -rf $HOME/netperf + - name: cleaning previous results shell: rm -rf $HOME/qtip_result + - name: making netperf temporary directory 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" + - name: Extracting Netperf shell: tar -xvf netperf-2.7.0.tar.gz + - name: configuring netperf shell: cd $HOME/netperf-2.7.0 && ./configure + - name: Making Netperf shell: cd $HOME/netperf-2.7.0 && make + - name: Installing Netperf shell: cd $HOME/netperf-2.7.0 && make install @@ -62,18 +74,24 @@ - 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={{workingdir}}/{{Dest_dir}}/netperf/netperf_temp - with_items: files_to_copy.stdout_lines - - hosts: 127.0.0.1 + with_items: "{{files_to_copy.stdout_lines}}" + + - hosts: localhost connection: local + gather_facts: no + tasks: - name: Rolename set_fact: rolename: "{{role}}" when: role is defined + - name: extracting_json 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 {{workingdir}}/{{Dest_dir}}/netperf/netperf_temp
\ No newline at end of file + shell: rm -rf {{workingdir}}/{{Dest_dir}}/netperf/netperf_temp diff --git a/benchmarks/playbooks/pktgen.yaml b/benchmarks/playbooks/pktgen.yaml index 466fb8e9..f466129b 100644 --- a/benchmarks/playbooks/pktgen.yaml +++ b/benchmarks/playbooks/pktgen.yaml @@ -1,17 +1,21 @@ - - hosts: 127.0.0.1 + - hosts: localhost connection: local - tasks: + gather_facts: no + tasks: - name: getting directory shell: echo $PWD register: qtip_dir + - name: making pktgen directory file: path={{workingdir}}/{{Dest_dir}}/pktgen state=directory + - name: making temporary pktgen directory file: path={{workingdir}}/{{Dest_dir}}/pktgen/pktgen_temp state=directory - hosts: "{{role}}" + tasks: - name: Rolename set_fact: @@ -21,18 +25,23 @@ - name: IPTABLE Setup shell: iptables -F when: rolename == '1-server' + - name: iptables shell: sudo iptables -A INPUT -p udp --dport 1000 -j DROP when: rolename == '1-server' + - name: run pktgen shell: bash pktgen.sh {{privateip1}} 1 {{packetsize}} {{duration}} >> .json when: rolename == '2-host' + - hosts: "{{role}}" + tasks: - name: Rolename set_fact: rolename: "{{role}}" when: role is defined + - name: Get server packetsize shell: iptables -L -vnx >> pktgenServer{{privateip1}}.txt - when: rolename == '1-server'
\ No newline at end of file + when: rolename == '1-server' diff --git a/benchmarks/playbooks/ramspeed.yaml b/benchmarks/playbooks/ramspeed.yaml index 096c7320..3fb78cb5 100644 --- a/benchmarks/playbooks/ramspeed.yaml +++ b/benchmarks/playbooks/ramspeed.yaml @@ -1,8 +1,11 @@ - - hosts: 127.0.0.1 + - hosts: localhost connection: local + gather_facts: no + tasks: - name: making ramspeed directory file: path={{workingdir}}/{{Dest_dir}}/ramspeed state=directory + - name: making temporary ramspeed directory file: path={{workingdir}}/{{Dest_dir}}/ramspeed/ramspeed_temp state=directory @@ -10,8 +13,9 @@ - hosts: "{{role}}" become: yes remote_user: "{{username}}" + tasks: - - name: checking_home directory + - name: checking home directory shell: echo $HOME register: home_dir @@ -77,7 +81,7 @@ - name: copy results fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/ramspeed/ramspeed_temp - with_items: files_to_copy.stdout_lines + with_items: "{{files_to_copy.stdout_lines}}" - name: registering log files shell: (cd $HOME/qtip_result/; find . -maxdepth 1 -name "*.log") | cut -d'/' -f2 @@ -85,16 +89,21 @@ - name: copying log results fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/ramspeed/ramspeed_temp - with_items: copy_log_results.stdout_lines + with_items: "{{copy_log_results.stdout_lines}}" - - hosts: 127.0.0.1 + - hosts: localhost connection: local + gather_facts: no + tasks: - name: extracting_json shell: ( find {{workingdir}}/{{Dest_dir}}/ramspeed/ramspeed_temp/ -name "*.json" | xargs cp -t {{workingdir}}/{{Dest_dir}}/ramspeed/) + - name: making_logs_folder shell: mkdir -p {{workingdir}}/{{Dest_dir}}/ramspeed/logs + - name: extracting_log 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 {{workingdir}}/{{Dest_dir}}/ramspeed/ramspeed_temp diff --git a/benchmarks/playbooks/ssl.yaml b/benchmarks/playbooks/ssl.yaml index fcb7585c..55e0af9b 100644 --- a/benchmarks/playbooks/ssl.yaml +++ b/benchmarks/playbooks/ssl.yaml @@ -1,15 +1,20 @@ - - hosts: 127.0.0.1 + - hosts: localhost connection: local + gather_facts: no + tasks: - name: making ssl directory file: path={{workingdir}}/{{Dest_dir}}/ssl state=directory + - name: making temporary ssl directory file: path={{workingdir}}/{{Dest_dir}}/ssl/ssl_temp state=directory + - hosts: "{{role}}" become: yes remote_user: "{{username}}" + tasks: - - name: checking_home directory + - name: checking home directory shell: sudo echo $HOME register: home_dir @@ -32,11 +37,11 @@ network: false - name: Installing OpenSSL dependencies when CentOS - shell: sudo yum install git wget gcc patch perl-Time-HiRes autofconf automake libpcap-devel libtool -y + shell: sudo yum install git wget gcc patch perl-Time-HiRes autofconf automake libpcap-devel libtool -y when: ansible_os_family == "RedHat" - name: Installing OpenSSL dependencies when Ubuntu - shell: sudo apt-get install git gcc wget perl autoconf automake libpcap-dev libtool -y + shell: sudo apt-get install git gcc wget perl autoconf automake libpcap-dev libtool -y when: ansible_os_family == "Debian" - name: Fetching OpenSSL @@ -59,7 +64,6 @@ - name: Benchmaring AES-128-cbc cipher encryption throughput shell: cd $HOME/Open_SSL/openssl-1.0.2f/apps && sudo ./openssl speed -evp aes-128-cbc >> $HOME/qtip_result/AES-128-CBC_dump - - name: Fetching result transformation script copy: src=./result_transform/ssl/ssl_transform.py dest={{home_dir.stdout}}/qtip_result @@ -78,7 +82,7 @@ - name: copy results fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/ssl/ssl_temp - with_items: files_to_copy.stdout_lines + with_items: "{{files_to_copy.stdout_lines}}" - name: registering log files shell: (cd $HOME/qtip_result/; find . -maxdepth 1 -name "*.log") | cut -d'/' -f2 @@ -86,19 +90,24 @@ - name: copying log results fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/ssl/ssl_temp - with_items: copy_log_results.stdout_lines - + with_items: "{{copy_log_results.stdout_lines}}" - - hosts: 127.0.0.1 + - hosts: localhost connection: local + gather_facts: no + tasks: - name: echo shell: echo $PWD + - name: extracting_json 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 + - 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 diff --git a/benchmarks/playbooks/sys_info_pbook.yaml b/benchmarks/playbooks/sys_info_pbook.yaml index bc47423f..cfcad119 100644 --- a/benchmarks/playbooks/sys_info_pbook.yaml +++ b/benchmarks/playbooks/sys_info_pbook.yaml @@ -40,8 +40,3 @@ - name: collecting system information for network test cases shell: cd $HOME/qtip_result && sudo python info_collect.py n when: network - - - - - diff --git a/benchmarks/playbooks/whetstone.yaml b/benchmarks/playbooks/whetstone.yaml index efe78cfd..98280e6a 100644 --- a/benchmarks/playbooks/whetstone.yaml +++ b/benchmarks/playbooks/whetstone.yaml @@ -1,5 +1,7 @@ - - hosts: 127.0.0.1 + - hosts: localhost connection: local + gather_facts: no + tasks: - name: making whetstone directory file: path={{workingdir}}/{{Dest_dir}}/whetstone state=directory @@ -10,6 +12,7 @@ - hosts: "{{role}}" become: yes remote_user: "{{username}}" + tasks: - name: storing_home shell: echo $HOME @@ -41,7 +44,8 @@ - include: ./git_proxy_pbook.yaml - name: Clone unixbench - shell: git clone https://github.com/kdlucas/byte-unixbench.git $HOME/tempT + git: repo=https://github.com/kdlucas/byte-unixbench.git + dest=$HOME/tempT - name: make shell: sudo make --directory $HOME/tempT/UnixBench/ @@ -79,7 +83,7 @@ - name: copy results fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/whetstone/whetstone_temp - with_items: files_to_copy.stdout_lines + 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 @@ -87,7 +91,7 @@ - name: copying log results fetch: src={{home_dir.stdout}}/qtip_result/log/{{item}} dest={{workingdir}}/{{Dest_dir}}/whetstone/whetstone_temp - with_items: copy_log_results.stdout_lines + with_items: "{{copy_log_results.stdout_lines}}" - name: cleaning tempT shell: sudo rm -rf $HOME/tempT @@ -95,9 +99,10 @@ - name: cleaning_qtip_result shell: sudo rm -rf $HOME/qtip_result - - - hosts: 127.0.0.1 + - hosts: localhost connection: local + gather_facts: no + tasks: - name: extracting_json shell: ( find {{workingdir}}/{{Dest_dir}}/whetstone/whetstone_temp/ -name "*.json" | xargs cp -t {{workingdir}}/{{Dest_dir}}/whetstone/) diff --git a/func/env_setup.py b/func/env_setup.py index 96f984cb..f6b1d43b 100644 --- a/func/env_setup.py +++ b/func/env_setup.py @@ -54,6 +54,8 @@ class Env_setup: num = len(role[k]) for x in range(num): f_name_2.write(role[k][x] + '\n') + f_name_2.write('[localhost]\n') + f_name_2.write('127.0.0.1\n') f_name_2.close() @staticmethod diff --git a/tests/output/hosts b/tests/output/hosts index 9b47df0e..b380e475 100644 --- a/tests/output/hosts +++ b/tests/output/hosts @@ -1,3 +1,5 @@ [host] 10.20.0.29 10.20.0.28 +[localhost] +127.0.0.1 |