zuul/zuul-jobs
Code Issues Proposed changes

Revert "Include tox_extra_args in tox siblings tasks"

Browse Source 
This reverts commit 8b1cc73ee3.

Apparently tox.requires adds lines like this to verbose showconfig
output:

    using tox-3.24.4 from /.../tox/__init__.py (pid 2919)

Which is confusing the current parser in the siblings module. Roll
this back while we work on a fix and regression test.

Change-Id: If3b1d48b36a5d32fddfdabd9c0ec1b81dd6453f2
This commit is contained in:
Jeremy Stanley 2021-09-30 17:52:35 +00:00
parent 7fcb90c59d
commit 3668acc723
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/tox/tasks/siblings.yaml
View File

@ -9,7 +9,6 @@
{% if tox_envlist is defined and tox_envlist %} {% if tox_envlist is defined and tox_envlist %}
-e{{ tox_envlist }} -e{{ tox_envlist }}
{% endif %} {% endif %}
{{ tox_extra_args }}
args: args:
chdir: "{{ zuul_work_dir }}" chdir: "{{ zuul_work_dir }}"
environment: "{{ tox_environment|combine(tox_constraints_env|default({})) }}" environment: "{{ tox_environment|combine(tox_constraints_env|default({})) }}"
@ -29,7 +28,6 @@
{% if tox_envlist is defined and tox_envlist %} {% if tox_envlist is defined and tox_envlist %}
-e{{ tox_envlist }} -e{{ tox_envlist }}
{% endif %} {% endif %}
{{ tox_extra_args }}
> {{ _tox_show_config_tempfile.path }} > {{ _tox_show_config_tempfile.path }}
args: args:
chdir: "{{ zuul_work_dir }}" chdir: "{{ zuul_work_dir }}"