From 63c045d23d596af11509e77fb35f74511df54860 Mon Sep 17 00:00:00 2001
From: Nathan Cutler <ncutler@suse.com>
Date: Fri, 3 May 2019 12:58:59 +0200
Subject: [PATCH] pybind/tox: pass additional command line arguments through to
 tox

Fixes: 9426f1f2045d0ae0f319530c3dc3a9240d838d07
Fixes: https://tracker.ceph.com/issues/39579
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit d04b44816028079ee65564d8244fe2b56c49047e)
---
 src/pybind/mgr/ansible/run-tox.sh          | 2 +-
 src/pybind/mgr/dashboard/run-tox.sh        | 2 +-
 src/pybind/mgr/insights/run-tox.sh         | 2 +-
 src/pybind/mgr/orchestrator_cli/run-tox.sh | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pybind/mgr/ansible/run-tox.sh b/src/pybind/mgr/ansible/run-tox.sh
index 5f215cd5fbcb0..f2eecd85fe1cb 100644
--- a/src/pybind/mgr/ansible/run-tox.sh
+++ b/src/pybind/mgr/ansible/run-tox.sh
@@ -35,7 +35,7 @@ fi
 # use bash string manipulation to strip off any trailing comma
 ENV_LIST=${ENV_LIST%,}
 
-tox -c "${TOX_PATH}" -e "${ENV_LIST}"
+tox -c "${TOX_PATH}" -e "${ENV_LIST}" "$@"
 TOX_STATUS="$?"
 test "$TOX_STATUS" -ne "0" && dump_envvars
 exit $TOX_STATUS
diff --git a/src/pybind/mgr/dashboard/run-tox.sh b/src/pybind/mgr/dashboard/run-tox.sh
index 3979a44836ee8..27c5851405402 100755
--- a/src/pybind/mgr/dashboard/run-tox.sh
+++ b/src/pybind/mgr/dashboard/run-tox.sh
@@ -43,7 +43,7 @@ fi
 # use bash string manipulation to strip off any trailing comma
 ENV_LIST=${ENV_LIST%,}
 
-tox -c "${TOX_PATH}" -e "${ENV_LIST}"
+tox -c "${TOX_PATH}" -e "${ENV_LIST}" "$@"
 TOX_STATUS="$?"
 test "$TOX_STATUS" -ne "0" && dump_envvars
 exit $TOX_STATUS
diff --git a/src/pybind/mgr/insights/run-tox.sh b/src/pybind/mgr/insights/run-tox.sh
index 590ca9bee4289..9a2c400f797c4 100644
--- a/src/pybind/mgr/insights/run-tox.sh
+++ b/src/pybind/mgr/insights/run-tox.sh
@@ -35,7 +35,7 @@ fi
 # use bash string manipulation to strip off any trailing comma
 ENV_LIST=${ENV_LIST%,}
 
-tox -c "${TOX_PATH}" -e "${ENV_LIST}"
+tox -c "${TOX_PATH}" -e "${ENV_LIST}" "$@"
 TOX_STATUS="$?"
 test "$TOX_STATUS" -ne "0" && dump_envvars
 exit $TOX_STATUS
diff --git a/src/pybind/mgr/orchestrator_cli/run-tox.sh b/src/pybind/mgr/orchestrator_cli/run-tox.sh
index d6e6f70e4c1bc..6a1a34186419d 100644
--- a/src/pybind/mgr/orchestrator_cli/run-tox.sh
+++ b/src/pybind/mgr/orchestrator_cli/run-tox.sh
@@ -40,7 +40,7 @@ ENV_LIST=$(echo "$ENV_LIST" | sed -e 's/,$//')
 # use bash string manipulation to strip off any trailing comma
 ENV_LIST=${ENV_LIST%,}
 
-tox -c "${TOX_PATH}" -e "${ENV_LIST}"
+tox -c "${TOX_PATH}" -e "${ENV_LIST}" "$@"
 TOX_STATUS="$?"
 test "$TOX_STATUS" -ne "0" && dump_envvars
 exit $TOX_STATUS
-- 
2.39.5