aboutsummaryrefslogtreecommitdiffstats
path: root/benchmarks/playbooks/sys_info_pbook.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'benchmarks/playbooks/sys_info_pbook.yaml')
-rw-r--r--benchmarks/playbooks/sys_info_pbook.yaml6
1 files changed, 1 insertions, 5 deletions
diff --git a/benchmarks/playbooks/sys_info_pbook.yaml b/benchmarks/playbooks/sys_info_pbook.yaml
index 9eca0bc3..19c811c7 100644
--- a/benchmarks/playbooks/sys_info_pbook.yaml
+++ b/benchmarks/playbooks/sys_info_pbook.yaml
@@ -7,7 +7,6 @@
- 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"
@@ -22,11 +21,8 @@
- 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
-
+ shell: cd $HOME/qtip_result && python info_collect.py