aboutsummaryrefslogtreecommitdiffstats
path: root/benchmarks/playbooks/sys_info_pbook.yaml
diff options
context:
space:
mode:
authorNauman Ahad <Nauman_Ahad@dell.com>2015-12-16 10:14:00 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-12-16 10:14:01 +0000
commitae3870b6863604d39bd15b0212bcf2694076a034 (patch)
tree66abbe6ea11fec7e027fab4481ae1cd9e44f054f /benchmarks/playbooks/sys_info_pbook.yaml
parent9f1f266140b86d3e42f2c217b4f0ce263c3e3b07 (diff)
parente51df601fe4a1bd22274e3da62659b1ed7b2c49b (diff)
Merge "Networking Testcase: Iperf Implemented"
Diffstat (limited to 'benchmarks/playbooks/sys_info_pbook.yaml')
-rw-r--r--benchmarks/playbooks/sys_info_pbook.yaml7
1 files changed, 7 insertions, 0 deletions
diff --git a/benchmarks/playbooks/sys_info_pbook.yaml b/benchmarks/playbooks/sys_info_pbook.yaml
index cc926b7e..9eca0bc3 100644
--- a/benchmarks/playbooks/sys_info_pbook.yaml
+++ b/benchmarks/playbooks/sys_info_pbook.yaml
@@ -7,6 +7,7 @@
- name: system info collection tool install when Ubuntu
shell: apt-get install inxi -y
when: ansible_os_family == "Debian"
+<<<<<<< HEAD
- name: Install ansible copy dependencies if remote host has selinux enabled
shell: yum install libselinux-python -y
when: ansible_os_family == "RedHat"
@@ -21,5 +22,11 @@
- name: collecting system information for network test cases
shell: cd $HOME/qtip_result && python info_collect.py n
when: network
+=======
+ - name: system_info script copy
+ copy: src=./info_script/info_collect.py dest={{home_dir.stdout}}/qtip_result/
+ - name: collecting_sys_info
+ shell: cd $HOME/qtip_result && python info_collect.py
+>>>>>>> 5a7dcc0... Networking testcases for QTIP Framework