From 293b064d2982029a903b39ce1e862e4427f08a1b Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Mon, 21 Oct 2019 21:05:00 +0200
Subject: [PATCH] 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
---
roles/fetch-subunit-output/README.rst | 2 +-
roles/fetch-subunit-output/defaults/main.yaml | 2 +-
roles/fetch-subunit-output/tasks/main.yaml | 2 +-
test-playbooks/base-roles/fetch-subunit-output.yaml | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/roles/fetch-subunit-output/README.rst b/roles/fetch-subunit-output/README.rst
index 2540dbfb0..a959f119e 100644
--- a/roles/fetch-subunit-output/README.rst
+++ b/roles/fetch-subunit-output/README.rst
@@ -7,7 +7,7 @@ Collect subunit outputs
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: []
List of additional directories which contains subunit files
diff --git a/roles/fetch-subunit-output/defaults/main.yaml b/roles/fetch-subunit-output/defaults/main.yaml
index 96c12e1dc..cda642faf 100644
--- a/roles/fetch-subunit-output/defaults/main.yaml
+++ b/roles/fetch-subunit-output/defaults/main.yaml
@@ -1,4 +1,4 @@
---
tox_envlist: ""
-zuul_additional_subunit_dirs: []
+fetch_subunit_output_additional_dirs: []
zuul_work_dir: "{{ ansible_user_dir }}/{{ zuul.project.src_dir }}"
diff --git a/roles/fetch-subunit-output/tasks/main.yaml b/roles/fetch-subunit-output/tasks/main.yaml
index 887f568f3..741b5a2c7 100644
--- a/roles/fetch-subunit-output/tasks/main.yaml
+++ b/roles/fetch-subunit-output/tasks/main.yaml
@@ -11,7 +11,7 @@
block:
- name: Get the list of directories with subunit files
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
# to zuul_work_dir prevents issues related to zuul_work_dir being
diff --git a/test-playbooks/base-roles/fetch-subunit-output.yaml b/test-playbooks/base-roles/fetch-subunit-output.yaml
index 9bfc30197..580191feb 100644
--- a/test-playbooks/base-roles/fetch-subunit-output.yaml
+++ b/test-playbooks/base-roles/fetch-subunit-output.yaml
@@ -86,7 +86,7 @@
hosts: all
roles:
- role: fetch-subunit-output
- zuul_additional_subunit_dirs:
+ fetch_subunit_output_additional_dirs:
- "/var/tmp/extratests"
post_tasks:
- name: Check that the testrepository file has been pulled