fetch_subunit: Change variable

Change new variable zuul_additional_subunit_dirs to
fetch_subunit_output_additional_dirs to name it after the role.

Change-Id: I7ac0b5d343701409a8741439334fe27f5374a258
This commit is contained in:
Andreas Jaeger 2019-10-21 21:05:00 +02:00
parent ab8f9fc403
commit 293b064d29
4 changed files with 4 additions and 4 deletions

View File

@ -7,7 +7,7 @@ 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 .. zuul:rolevar:: fetch_subunit_output_additional_dirs
:default: [] :default: []
List of additional directories which contains subunit files List of additional directories which contains subunit files

View File

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

View File

@ -11,7 +11,7 @@
block: block:
- name: Get the list of directories with subunit files - name: Get the list of directories with subunit files
set_fact: set_fact:
all_subunit_dirs: "{{ [ zuul_work_dir ] + zuul_additional_subunit_dirs }}" all_subunit_dirs: "{{ [ zuul_work_dir ] + fetch_subunit_output_additional_dirs }}"
# The usage an independent target file instead of sending the output # The usage an independent target file instead of sending the output
# to zuul_work_dir prevents issues related to zuul_work_dir being # to zuul_work_dir prevents issues related to zuul_work_dir being

View File

@ -86,7 +86,7 @@
hosts: all hosts: all
roles: roles:
- role: fetch-subunit-output - role: fetch-subunit-output
zuul_additional_subunit_dirs: fetch_subunit_output_additional_dirs:
- "/var/tmp/extratests" - "/var/tmp/extratests"
post_tasks: post_tasks:
- name: Check that the testrepository file has been pulled - name: Check that the testrepository file has been pulled