Include tox_extra_args in tox siblings tasks
When the tox role was introduced, a tox_extra_args rolevar was included allowing the tox command line to be extended with arbitrary options. When siblings functionality was added, tox_extra_args did not get included in its separate tox invocations. If a project has a particular situation where some aspect of tox's functionality must be overridden in order to work, doing so through tox_extra_args needs to apply to every tox invocation, including siblings installs. Change-Id: Ibfe77f67e43135ae5af7588d6859b8b3dbd4c3ca
This commit is contained in:
parent
bc8776bad4
commit
8b1cc73ee3
@ -9,6 +9,7 @@
|
||||
{% if tox_envlist is defined and tox_envlist %}
|
||||
-e{{ tox_envlist }}
|
||||
{% endif %}
|
||||
{{ tox_extra_args }}
|
||||
args:
|
||||
chdir: "{{ zuul_work_dir }}"
|
||||
environment: "{{ tox_environment|combine(tox_constraints_env|default({})) }}"
|
||||
@ -28,6 +29,7 @@
|
||||
{% if tox_envlist is defined and tox_envlist %}
|
||||
-e{{ tox_envlist }}
|
||||
{% endif %}
|
||||
{{ tox_extra_args }}
|
||||
> {{ _tox_show_config_tempfile.path }}
|
||||
args:
|
||||
chdir: "{{ zuul_work_dir }}"
|
||||
|
Loading…
Reference in New Issue
Block a user