Move subunit processing into fetch-testr-output
This logic makes more sense in the fetch-testr-output role. I've also left a few TODO action for a followup patch. Specifically, this still depends some openstack-infra configuration. Change-Id: Iea8968708e3e80f0d21434ec08fff5e4ee7bdf4d Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
parent
09aa19e8a2
commit
d2d4abedc5
@ -1,13 +1,12 @@
|
|||||||
- name: Register subunit file
|
- name: Register testrepository directory
|
||||||
stat:
|
stat:
|
||||||
path: "{{ zuul_work_dir }}/testrepository.subunit"
|
path: "{{ zuul_work_dir }}/.testrepository"
|
||||||
register: p
|
register: testrepository_stat
|
||||||
|
|
||||||
- name: Compress subunit file to archive to logs server
|
- name: Process testr artifacts
|
||||||
archive:
|
include: process.yaml
|
||||||
path: "{{ p.stat.path }}"
|
|
||||||
when:
|
when:
|
||||||
- p.stat.exists
|
- testrepository_stat.stat.exists
|
||||||
|
|
||||||
- name: Collect test-results
|
- name: Collect test-results
|
||||||
synchronize:
|
synchronize:
|
||||||
|
33
roles/fetch-testr-output/tasks/process.yaml
Normal file
33
roles/fetch-testr-output/tasks/process.yaml
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
- name: Generate testrepository.subunit file
|
||||||
|
# TODO(pabelanger): We cannot depend on tox_envlist here!!!
|
||||||
|
shell: ".tox/{{ tox_envlist }}/bin/testr last --subunit > ./testrepository.subunit"
|
||||||
|
args:
|
||||||
|
chdir: "{{ zuul_work_dir }}"
|
||||||
|
|
||||||
|
- name: Generate testr_results.html file
|
||||||
|
# TODO(pabelanger): We cannot depend on /usr/os-testr-env here!!!
|
||||||
|
command: "/usr/os-testr-env/bin/subunit2html ./testrepository.subunit testr_results.html"
|
||||||
|
args:
|
||||||
|
chdir: "{{ zuul_work_dir }}"
|
||||||
|
|
||||||
|
- name: Register testrepository.subunit file
|
||||||
|
stat:
|
||||||
|
path: "{{ zuul_work_dir }}/testrepository.subunit"
|
||||||
|
register: p
|
||||||
|
|
||||||
|
- name: Compress testrepository.subunit file
|
||||||
|
archive:
|
||||||
|
path: "{{ p.stat.path }}"
|
||||||
|
when:
|
||||||
|
- p.stat.exists
|
||||||
|
|
||||||
|
- name: Register testr_results.html file
|
||||||
|
stat:
|
||||||
|
path: "{{ zuul_work_dir }}/testr_results.html"
|
||||||
|
register: html
|
||||||
|
|
||||||
|
- name: Compress testr_results.html file
|
||||||
|
archive:
|
||||||
|
path: "{{ html.stat.path }}"
|
||||||
|
when:
|
||||||
|
- html.stat.exists
|
@ -20,14 +20,6 @@
|
|||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -f ".testrepository/0.2" ] ; then
|
|
||||||
cp .testrepository/0.2 ./testrepository.subunit
|
|
||||||
elif [ -f ".testrepository/0" ] ; then
|
|
||||||
$bin_path/testr last --subunit > ./testrepository.subunit
|
|
||||||
fi
|
|
||||||
/usr/os-testr-env/bin/subunit2html ./testrepository.subunit testr_results.html
|
|
||||||
gzip -9 ./testr_results.html
|
|
||||||
|
|
||||||
rancount=$($bin_path/testr last | sed -ne 's/Ran \([0-9]\+\).*tests in.*/\1/p')
|
rancount=$($bin_path/testr last | sed -ne 's/Ran \([0-9]\+\).*tests in.*/\1/p')
|
||||||
if [ -z "$rancount" ] || [ "$rancount" -eq "0" ] ; then
|
if [ -z "$rancount" ] || [ "$rancount" -eq "0" ] ; then
|
||||||
echo
|
echo
|
||||||
|
Loading…
Reference in New Issue
Block a user