Revert "fetch-subunit-output: collect additional subunit files"

This reverts commit 8624201e0c.

This breaks builds like in https://logs.opendev.org/01/673401/2/check/openstacksdk-tox-py36-tips/0e0bed9/job-output.txt.gz#_2019-08-01_17_04_29_549629

Change-Id: Ie4c8f966cfe72828a6ff9a7512948d6c55c62fde
This commit is contained in:
Andreas Jaeger 2019-08-01 17:55:58 +00:00
parent 8624201e0c
commit 04f4cecaec
3 changed files with 2 additions and 14 deletions

View File

@ -7,13 +7,6 @@ Collect subunit outputs
Directory to work in. It has to be a fully qualified path. Directory to work in. It has to be a fully qualified path.
.. zuul:rolevar:: zuul_additional_subunit_dirs
:default: []
List of additional directories which contains subunit files
to collect. The content of zuul_work_dir is always checked,
so it should not be added here.
.. zuul:rolevar:: tox_envlist .. zuul:rolevar:: tox_envlist
tox environment that was used to run the tests originally. tox environment that was used to run the tests originally.

View File

@ -1,4 +1,3 @@
--- ---
tox_envlist: "" tox_envlist: ""
zuul_additional_subunit_dirs: []
zuul_work_dir: "{{ ansible_user_dir }}/{{ zuul.project.src_dir }}" zuul_work_dir: "{{ ansible_user_dir }}/{{ zuul.project.src_dir }}"

View File

@ -9,15 +9,11 @@
- testr_command.rc == 0 - testr_command.rc == 0
- testr_command.stdout_lines - testr_command.stdout_lines
block: block:
- name: Get the list of directories with subunit files
set_fact:
subunit_dirs: "{{ [ zuul_work_dir ] + zuul_additional_subunit_dirs }}"
- name: Generate subunit file - name: Generate subunit file
shell: shell:
cmd: "{{ testr_command.stdout_lines[0] }} last --subunit >>{{ zuul_work_dir }}/testrepository.subunit" cmd: "{{ testr_command.stdout_lines[0] }} last --subunit > ./testrepository.subunit"
chdir: "{{ item }}" chdir: "{{ zuul_work_dir }}"
loop: "{{ subunit_dirs }}"
- name: Process and fetch subunit results - name: Process and fetch subunit results
include: process.yaml include: process.yaml