From 3668acc723d5b54cdaf789842a3c6e236bb6adb7 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Thu, 30 Sep 2021 17:52:35 +0000
Subject: [PATCH] Revert "Include tox_extra_args in tox siblings tasks"

This reverts commit 8b1cc73ee30428517f9524624b9eb309e9b14c1f.

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
---
 roles/tox/tasks/siblings.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/roles/tox/tasks/siblings.yaml b/roles/tox/tasks/siblings.yaml
index 33ba98828..a838f2e59 100644
--- a/roles/tox/tasks/siblings.yaml
+++ b/roles/tox/tasks/siblings.yaml
@@ -9,7 +9,6 @@
     {% 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({})) }}"
@@ -29,7 +28,6 @@
     {% 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 }}"