From 39342467e5e647ae605f40bed04c5a3b3bc50f5e Mon Sep 17 00:00:00 2001 From: Mofassir Arif Date: Tue, 22 Dec 2015 04:17:57 -0800 Subject: Restructured QTIP directories and CLI I have changed the arguments for the CLI and now QTIP takes a file along withthe name of the lab to run on Right now only the config files for the dell lab have been added, These will increase when we make QTIP available for other labs. I have also added the provision of changing the public network from the config file and some leftover files from previous verisons have been remove Change-Id: Ifeb01d80099eab06dc77a7b2e07097ebb17a13a2 Signed-off-by: Mofassir Arif --- benchmarks/playbooks/sys_info_pbook.yaml | 2 +- benchmarks/playbooks/whetstone.yaml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'benchmarks') diff --git a/benchmarks/playbooks/sys_info_pbook.yaml b/benchmarks/playbooks/sys_info_pbook.yaml index 19c811c7..12c735e9 100644 --- a/benchmarks/playbooks/sys_info_pbook.yaml +++ b/benchmarks/playbooks/sys_info_pbook.yaml @@ -11,7 +11,7 @@ shell: yum install libselinux-python -y when: ansible_os_family == "RedHat" - name: Install ansiblle copy dependencies if remote host has selinux enaled - shell: apt-get install libselinux-python -y + shell: apt-get install python-selinux -y when: ansible_os_family == "Debian" - name: system_info script copy copy: src=./info_script/info_collect.py dest={{home_dir.stdout}}/qtip_result/ diff --git a/benchmarks/playbooks/whetstone.yaml b/benchmarks/playbooks/whetstone.yaml index c22ea433..847474fd 100644 --- a/benchmarks/playbooks/whetstone.yaml +++ b/benchmarks/playbooks/whetstone.yaml @@ -2,9 +2,9 @@ connection: local tasks: - name: making whetstone directory - file: path={{Dest_dir}}/whetstone state=directory + file: path=../../{{Dest_dir}}/whetstone state=directory - name: making temporary whetstone directory - file: path={{Dest_dir}}/whetstone/whetstone_temp state=directory + file: path=../../{{Dest_dir}}/whetstone/whetstone_temp state=directory - hosts: "{{role}}" @@ -54,13 +54,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}}/whetstone/whetstone_temp + fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest=../../{{Dest_dir}}/whetstone/whetstone_temp 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 register: copy_log_results - name: copying log results - fetch: src={{home_dir.stdout}}/qtip_result/log/{{item}} dest={{Dest_dir}}/whetstone/whetstone_temp + fetch: src={{home_dir.stdout}}/qtip_result/log/{{item}} dest=../../{{Dest_dir}}/whetstone/whetstone_temp with_items: copy_log_results.stdout_lines - name: cleaning tempT shell: rm -rf $HOME/tempT @@ -72,10 +72,10 @@ connection: local tasks: - name: extracting_json - shell: ( find {{Dest_dir}}/whetstone/whetstone_temp/ -name "*.json" | xargs cp -t {{Dest_dir}}/whetstone/) + shell: ( find ../../{{Dest_dir}}/whetstone/whetstone_temp/ -name "*.json" | xargs cp -t ../../{{Dest_dir}}/whetstone/) - name: making_logs_folder - shell: mkdir -p {{Dest_dir}}/whetstone/logs + shell: mkdir -p ../../{{Dest_dir}}/whetstone/logs - name: extracting_log - shell: ( find {{Dest_dir}}/whetstone/whetstone_temp/ -name "*.log" | xargs cp -t {{Dest_dir}}/whetstone/logs) + shell: ( find ../../{{Dest_dir}}/whetstone/whetstone_temp/ -name "*.log" | xargs cp -t ../../{{Dest_dir}}/whetstone/logs) - name: removing whetstone_temp - shell: rm -rf {{Dest_dir}}/whetstone/whetstone_temp + shell: rm -rf ../../{{Dest_dir}}/whetstone/whetstone_temp -- cgit 1.2.3-korg