Delete results directory from qtip repos.
And the results files will be stored under
/home/opnfv/qtip/results.
Change-Id: Ie1091e60eb77068c20a9095f0f85454f18173872
Signed-off-by: wu.zhihui <wu.zhihui1@zte.com.cn>
tasks:
- name: making dhrystone directory
- file: path={{workingdir}}/{{Dest_dir}}/dhrystone state=directory
+ file: path={{Dest_dir}}/dhrystone state=directory
- name: making temporary dhrystone directory
- file: path={{workingdir}}/{{Dest_dir}}/dhrystone/dhrystone_temp state=directory
+ file: path={{Dest_dir}}/dhrystone/dhrystone_temp state=directory
- hosts: "{{role}}"
become: yes
register: files_to_copy
- name: copy results
- fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/dhrystone/dhrystone_temp
+ fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{Dest_dir}}/dhrystone/dhrystone_temp
with_items: "{{files_to_copy.stdout_lines}}"
- name: registering log files
register: copy_log_results
- name: copying log results
- fetch: src={{home_dir.stdout}}/qtip_result/log/{{item}} dest={{workingdir}}/{{Dest_dir}}/dhrystone/dhrystone_temp
+ fetch: src={{home_dir.stdout}}/qtip_result/log/{{item}} dest={{Dest_dir}}/dhrystone/dhrystone_temp
with_items: "{{copy_log_results.stdout_lines}}"
- name: cleaning tempT
tasks:
- name: extracting_json
- shell: ( find {{workingdir}}/{{Dest_dir}}/dhrystone/dhrystone_temp/ -name "*.json" | xargs cp -t {{workingdir}}/{{Dest_dir}}/dhrystone/)
+ shell: (find {{Dest_dir}}/dhrystone/dhrystone_temp/ -name "*.json" | xargs cp -t {{Dest_dir}}/dhrystone/)
- name: making_logs_folder
- file: path={{workingdir}}/{{Dest_dir}}/dhrystone/logs state=directory
+ file: path={{Dest_dir}}/dhrystone/logs state=directory
- name: extracting_log
- shell: ( find {{workingdir}}/{{Dest_dir}}/dhrystone/dhrystone_temp/ -name "*.log" | xargs cp -t {{workingdir}}/{{Dest_dir}}/dhrystone/logs)
+ shell: (find {{Dest_dir}}/dhrystone/dhrystone_temp/ -name "*.log" | xargs cp -t {{Dest_dir}}/dhrystone/logs)
- name: removing dhrystone_temp
- file: path={{workingdir}}/{{Dest_dir}}/dhrystone/dhrystone_temp state=directory
+ file: path={{Dest_dir}}/dhrystone/dhrystone_temp state=directory
tasks:
- name: making dpi directory
- file: path={{workingdir}}/{{Dest_dir}}/dpi state=directory
+ file: path={{Dest_dir}}/dpi state=directory
- name: making temporary whetstone directory
- file: path={{workingdir}}/{{Dest_dir}}/dpi/dpi_temp state=directory
+ file: path={{Dest_dir}}/dpi/dpi_temp state=directory
- hosts: "{{role}}"
become: yes
register: files_to_copy
- name: copy results
- fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/dpi/dpi_temp
+ fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{Dest_dir}}/dpi/dpi_temp
with_items: "{{files_to_copy.stdout_lines}}"
- name: registering log files
register: copy_log_results
- name: copying log results
- fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/dpi/dpi_temp
+ fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{Dest_dir}}/dpi/dpi_temp
with_items: "{{copy_log_results.stdout_lines}}"
- name: cleaning tempD
tasks:
- name: extracting_json
- shell: ( find {{workingdir}}/{{Dest_dir}}/dpi/dpi_temp/ -name "*.json" | xargs cp -t {{workingdir}}/{{Dest_dir}}/dpi/)
+ shell: (find {{Dest_dir}}/dpi/dpi_temp/ -name "*.json" | xargs cp -t {{Dest_dir}}/dpi/)
- name: making_logs_folder
- file: path={{workingdir}}/{{Dest_dir}}/dpi/logs state=directory
+ file: path={{Dest_dir}}/dpi/logs state=directory
- name: extracting_log
- shell: ( find {{workingdir}}/{{Dest_dir}}/dpi/dpi_temp/ -name "*.log" | xargs cp -t {{workingdir}}/{{Dest_dir}}/dpi/logs)
+ shell: (find {{Dest_dir}}/dpi/dpi_temp/ -name "*.log" | xargs cp -t {{Dest_dir}}/dpi/logs)
- name: removing dpi_temp
- file: path={{workingdir}}/{{Dest_dir}}/dpi/dpi_temp state=absent
+ file: path={{Dest_dir}}/dpi/dpi_temp state=absent
tasks:
- name: making fio directory
- file: path={{workingdir}}/{{Dest_dir}}/fio state=directory
+ file: path={{Dest_dir}}/fio state=directory
- name: making temporary fio directory
- file: path={{workingdir}}/{{Dest_dir}}/fio/fio_temp state=directory
+ file: path={{Dest_dir}}/fio/fio_temp state=directory
- hosts: "{{role}}"
register: files_to_copy
- name: copy results
- fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/fio/fio_temp
+ fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{Dest_dir}}/fio/fio_temp
with_items: "{{files_to_copy.stdout_lines}}"
- name: registering log files
register: copy_log_results
- name: copying log results
- fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/fio/fio_temp
+ fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{Dest_dir}}/fio/fio_temp
with_items: "{{copy_log_results.stdout_lines}}"
- name: cleaning fio
tasks:
- name: extracting_json
- shell: ( find {{workingdir}}/{{Dest_dir}}/fio/fio_temp/ -name "*.json" | xargs cp -t {{workingdir}}/{{Dest_dir}}/fio/)
+ shell: (find {{Dest_dir}}/fio/fio_temp/ -name "*.json" | xargs cp -t {{Dest_dir}}/fio/)
- name: making_logs_folder
- file: path={{workingdir}}/{{Dest_dir}}/fio/logs state=directory
+ file: path={{Dest_dir}}/fio/logs state=directory
- name: extracting_log
- shell: ( find {{workingdir}}/{{Dest_dir}}/fio/fio_temp/ -name "*.log" | xargs cp -t {{workingdir}}/{{Dest_dir}}/fio/logs)
+ shell: (find {{Dest_dir}}/fio/fio_temp/ -name "*.log" | xargs cp -t {{Dest_dir}}/fio/logs)
- name: removing fio_log
- file: path={{workingdir}}/{{Dest_dir}}/fio/fio_temp state=absent
+ file: path={{Dest_dir}}/fio/fio_temp state=absent
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
+ file: path={{Dest_dir}}/iperf state=directory
- name: making temporary iperf directory
- file: path={{workingdir}}/{{Dest_dir}}/iperf/iperf_temp state=directory
+ file: path={{Dest_dir}}/iperf/iperf_temp state=directory
- hosts: "{{role}}"
when: rolename =="2-host" and "{{ip2}}" == ''
- name: copy results
- fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/iperf/iperf_temp
+ fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{Dest_dir}}/iperf/iperf_temp
with_items: "{{files_to_copy.stdout_lines}}"
when: rolename =="2-host" and "{{ip2}}" == ''
when: rolename =="2-host" and "{{ip2}}" == ''
- name: copying log results
- fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/iperf/iperf_temp
+ fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{Dest_dir}}/iperf/iperf_temp
with_items: "{{copy_log_results.stdout_lines}}"
when: rolename =="2-host" and "{{ip2}}" == ''
when: role is defined
- name: extracting_json
- shell: ( find {{workingdir}}/{{Dest_dir}}/iperf/iperf_temp/ -name "*.json" | xargs cp -t {{workingdir}}/{{Dest_dir}}/iperf/)
+ shell: (find {{Dest_dir}}/iperf/iperf_temp/ -name "*.json" | xargs cp -t {{Dest_dir}}/iperf/)
when: rolename == "2-host"
- name: making_logs_folder
- file: path={{workingdir}}/{{Dest_dir}}/iperf/logs state=directory
+ file: path={{Dest_dir}}/iperf/logs state=directory
- name: extracting_log
- shell: ( find {{workingdir}}/{{Dest_dir}}/iperf/iperf_temp/ -name "*.log" | xargs cp -t {{workingdir}}/{{Dest_dir}}/iperf/logs)
+ shell: ( find {{Dest_dir}}/iperf/iperf_temp/ -name "*.log" | xargs cp -t {{Dest_dir}}/iperf/logs)
when: rolename == "2-host"
- name: removing iperf_raw file
- file: path={{workingdir}}/{{Dest_dir}}/iperf/iperf_raw.json state=absent
+ file: path={{Dest_dir}}/iperf/iperf_raw.json state=absent
when: rolename == "2-host"
- name: removing iperf_temp
- file: path={{workingdir}}/{{Dest_dir}}/iperf/iperf_temp state=absent
+ file: path={{Dest_dir}}/iperf/iperf_temp state=absent
tasks:
- name: making ramspeed directory
- file: path={{workingdir}}/{{Dest_dir}}/ramspeed state=directory
+ file: path={{Dest_dir}}/ramspeed state=directory
- name: making temporary ramspeed directory
- file: path={{workingdir}}/{{Dest_dir}}/ramspeed/ramspeed_temp state=directory
+ file: path={{Dest_dir}}/ramspeed/ramspeed_temp state=directory
- hosts: "{{role}}"
register: files_to_copy
- name: copy results
- fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/ramspeed/ramspeed_temp
+ fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{Dest_dir}}/ramspeed/ramspeed_temp
with_items: "{{files_to_copy.stdout_lines}}"
- name: registering log files
register: copy_log_results
- name: copying log results
- fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/ramspeed/ramspeed_temp
+ fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{Dest_dir}}/ramspeed/ramspeed_temp
with_items: "{{copy_log_results.stdout_lines}}"
- name: cleaning ramspeed directory
tasks:
- name: extracting_json
- shell: ( find {{workingdir}}/{{Dest_dir}}/ramspeed/ramspeed_temp/ -name "*.json" | xargs cp -t {{workingdir}}/{{Dest_dir}}/ramspeed/)
+ shell: (find /{{Dest_dir}}/ramspeed/ramspeed_temp/ -name "*.json" | xargs cp -t {{Dest_dir}}/ramspeed/)
- name: making_logs_folder
- file: path={{workingdir}}/{{Dest_dir}}/ramspeed/logs state=directory
+ file: path={{Dest_dir}}/ramspeed/logs state=directory
- name: extracting_log
- shell: ( find {{workingdir}}/{{Dest_dir}}/ramspeed/ramspeed_temp/ -name "*.log" | xargs cp -t {{workingdir}}/{{Dest_dir}}/ramspeed/logs)
+ shell: ( find {{Dest_dir}}/ramspeed/ramspeed_temp/ -name "*.log" | xargs cp -t {{Dest_dir}}/ramspeed/logs)
- name: removing ramspeed_log
- file: path={{workingdir}}/{{Dest_dir}}/ramspeed/ramspeed_temp state=absent
+ file: path={{Dest_dir}}/ramspeed/ramspeed_temp state=absent
tasks:
- name: making ssl directory
- file: path={{workingdir}}/{{Dest_dir}}/ssl state=directory
+ file: path={{Dest_dir}}/ssl state=directory
- name: making temporary ssl directory
- file: path={{workingdir}}/{{Dest_dir}}/ssl/ssl_temp state=directory
+ file: path={{Dest_dir}}/ssl/ssl_temp state=directory
- hosts: "{{role}}"
become: yes
register: files_to_copy
- name: copy results
- fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/ssl/ssl_temp
+ fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{Dest_dir}}/ssl/ssl_temp
with_items: "{{files_to_copy.stdout_lines}}"
- name: registering log files
register: copy_log_results
- name: copying log results
- fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/ssl/ssl_temp
+ fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{Dest_dir}}/ssl/ssl_temp
with_items: "{{copy_log_results.stdout_lines}}"
- name: cleaning Open_SSL directory
shell: echo $PWD
- name: extracting_json
- shell: ( find {{workingdir}}/{{Dest_dir}}/ssl/ssl_temp/ -name "*.json" | xargs cp -t {{workingdir}}/{{Dest_dir}}/ssl/)
+ shell: (find {{Dest_dir}}/ssl/ssl_temp/ -name "*.json" | xargs cp -t {{Dest_dir}}/ssl/)
- name: making_logs_folder
- file: path={{workingdir}}/{{Dest_dir}}/ssl/logs state=directory
+ file: path={{Dest_dir}}/ssl/logs state=directory
- name: extracting_log
- shell: ( find {{workingdir}}/{{Dest_dir}}/ssl/ssl_temp/ -name "*.log" | xargs cp -t {{workingdir}}/{{Dest_dir}}/ssl/logs)
+ shell: (find {{Dest_dir}}/ssl/ssl_temp/ -name "*.log" | xargs cp -t {{Dest_dir}}/ssl/logs)
- name: removing ssl_temp
- file: path={{workingdir}}/{{Dest_dir}}/ssl/ssl_temp state=absent
+ file: path={{Dest_dir}}/ssl/ssl_temp state=absent
tasks:
- name: making whetstone directory
- file: path={{workingdir}}/{{Dest_dir}}/whetstone state=directory
+ file: path={{Dest_dir}}/whetstone state=directory
- name: making temporary whetstone directory
- file: path={{workingdir}}/{{Dest_dir}}/whetstone/whetstone_temp state=directory
+ file: path={{Dest_dir}}/whetstone/whetstone_temp state=directory
- hosts: "{{role}}"
become: yes
register: files_to_copy
- name: copy results
- fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{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
register: copy_log_results
- name: copying log results
- fetch: src={{home_dir.stdout}}/qtip_result/log/{{item}} dest={{workingdir}}/{{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 directory
tasks:
- name: extracting_json
- shell: ( find {{workingdir}}/{{Dest_dir}}/whetstone/whetstone_temp/ -name "*.json" | xargs cp -t {{workingdir}}/{{Dest_dir}}/whetstone/)
+ shell: (find {{Dest_dir}}/whetstone/whetstone_temp/ -name "*.json" | xargs cp -t {{Dest_dir}}/whetstone/)
- name: making_logs_folder
- file: path={{workingdir}}/{{Dest_dir}}/whetstone/logs state=directory
+ file: path={{Dest_dir}}/whetstone/logs state=directory
- name: extracting_log
- shell: ( find {{workingdir}}/{{Dest_dir}}/whetstone/whetstone_temp/ -name "*.log" | xargs cp -t {{workingdir}}/{{Dest_dir}}/whetstone/logs)
+ shell: (find {{Dest_dir}}/whetstone/whetstone_temp/ -name "*.log" | xargs cp -t {{Dest_dir}}/whetstone/logs)
- name: removing whetstone_temp
- file: path={{workingdir}}/{{Dest_dir}}/whetstone/whetstone_temp state=absent
+ file: path={{Dest_dir}}/whetstone/whetstone_temp state=absent
RUN mkdir -p ${REPOS_DIR}
RUN mkdir -p /root/.ssh
RUN mkdir -p $HOME/qtip/logs
+RUN mkdir -p $HOME/qtip/results
+
RUN chmod 700 /root/.ssh
#Config ansible
from utils import logger_utils
from operator import add
from ansible_api import AnsibleApi
+from os.path import expanduser
logger = logger_utils.QtipLogger('driver').get
def get_common_var_json(self, installer_type, pwd, benchmark_fname,
benchmark_detail, pip_dict, proxy_info):
- common_json = {'Dest_dir': 'results',
+ common_json = {'Dest_dir': expanduser('~') + '/qtip/results',
'ip1': '',
'ip2': '',
'installer': str(installer_type),
import importlib
import sys
from utils import logger_utils
+from os.path import expanduser
logger = logger_utils.QtipLogger('suite_result').get
suite_index = temp / l
suite_dict_f = {'index': suite_index,
'suite_results': suite_dict}
- with open('results/{0}_result.json'.format(suite_name), 'w+') as result_json:
+ result_path = expanduser('~') + '/qtip/results'
+ with open('{0}/{1}_result.json'.format(result_path, suite_name), 'w+') as result_json:
json.dump(suite_dict_f, result_json, indent=4, sort_keys=True)
return True
import pytest
import mock
from func.driver import Driver
+from os.path import expanduser
+
+HOME_DIR = expanduser('~')
class TestClass:
{'http_proxy': 'http://10.20.0.1:8118',
'https_proxy': 'http://10.20.0.1:8118',
'no_proxy': 'localhost,127.0.0.1,10.20.*,192.168.*'}],
- [{'Dest_dir': 'results',
+ [{'Dest_dir': HOME_DIR + '/qtip/results',
'ip1': '',
'ip2': '',
'installer': 'fuel',
[('duration', 20), ('protocol', 'tcp'), ('bandwidthGbps', 0)],
[('1-server', '10.10.17.4'), ('2-host', '10.10.17.5')],
{}],
- [{'Dest_dir': 'results',
+ [{'Dest_dir': HOME_DIR + '/qtip/results',
'ip1': '10.20.0.13',
'ip2': '',
'installer': 'joid',
'protocol': 'tcp',
'bandwidthGbps': 0,
"role": "1-server"},
- {'Dest_dir': 'results',
+ {'Dest_dir': HOME_DIR + '/qtip/results',
'ip1': '10.20.0.13',
'ip2': '',
'installer': 'joid',