diff options
author | Nauman Ahad <Nauman_Ahad@dell.com> | 2015-12-16 10:14:00 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@172.30.200.206> | 2015-12-16 10:14:01 +0000 |
commit | ae3870b6863604d39bd15b0212bcf2694076a034 (patch) | |
tree | 66abbe6ea11fec7e027fab4481ae1cd9e44f054f /benchmarks/playbooks/ssl.yaml | |
parent | 9f1f266140b86d3e42f2c217b4f0ce263c3e3b07 (diff) | |
parent | e51df601fe4a1bd22274e3da62659b1ed7b2c49b (diff) |
Merge "Networking Testcase: Iperf Implemented"
Diffstat (limited to 'benchmarks/playbooks/ssl.yaml')
-rw-r--r-- | benchmarks/playbooks/ssl.yaml | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/benchmarks/playbooks/ssl.yaml b/benchmarks/playbooks/ssl.yaml index 89020bd7..8b5b427b 100644 --- a/benchmarks/playbooks/ssl.yaml +++ b/benchmarks/playbooks/ssl.yaml @@ -2,9 +2,15 @@ connection: local tasks: - name: making ssl directory +<<<<<<< HEAD file: path={{Dest_dir}}/ssl state=directory - name: making temporary ssl directory file: path={{Dest_dir}}/ssl/ssl_temp state=directory +======= + file: path=../../{{Dest_dir}}/ssl state=directory + - name: making temporary ssl directory + file: path=../../{{Dest_dir}}/ssl/ssl_temp state=directory +>>>>>>> 5a7dcc0... Networking testcases for QTIP Framework - hosts: "{{role}}" @@ -22,8 +28,11 @@ - name: making results temporary directory shell: mkdir $HOME/qtip_result - include: ./sys_info_pbook.yaml +<<<<<<< HEAD vars: network: false +======= +>>>>>>> 5a7dcc0... Networking testcases for QTIP Framework - name: Installing OpenSSL dependencies when CentOS shell: yum install git wget gcc patch perl-Time-HiRes autofconf automake libpcap-devel libtool -y when: ansible_os_family == "RedHat" @@ -74,6 +83,7 @@ connection: local tasks: - name: extracting_json +<<<<<<< HEAD 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 @@ -81,4 +91,13 @@ 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 +======= + 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) + - name: removing ssl_temp + shell: rm -rf {{../../Dest_dir}}/ssl/ssl_temp +>>>>>>> 5a7dcc0... Networking testcases for QTIP Framework |