summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorSorin Sbarnea <ssbarnea@redhat.com>2020-04-28 10:55:13 +0100
committerSorin Sbarnea <ssbarnea@redhat.com>2020-04-28 10:55:13 +0100
commit1ce6cb860f5477faa64d5601caaf4e7c8c9043ce (patch)
treeaaba1974dc6f9e2632ef90e3f260d7bfa37b8471 /tox.ini
parent9b300bc8dfc59584e3046337e7c001fc927d670f (diff)
downloadzuul-1ce6cb860f5477faa64d5601caaf4e7c8c9043ce.tar.gz
Add DOCKER_* to passenv
We missed including DOCKER_* to tox passenv and that prevented use of docker for users that are using other hosts. Most notable option is DOCKER_HOST but any docker specific options should be passed, so the docker commands keep their behaviors. This also sorts passenv list, to ease maintenance. Change-Id: Iac436da1202066541fc98eb94a2a228e6cf8b337
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini18
1 files changed, 10 insertions, 8 deletions
diff --git a/tox.ini b/tox.ini
index 1811c3ab3..29c6bfcd8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -17,14 +17,15 @@ setenv =
OS_STDERR_CAPTURE={env:OS_STDERR_CAPTURE:1}
OS_LOG_CAPTURE={env:OS_LOG_CAPTURE:1}
passenv =
- ZUUL_TEST_ROOT
- OS_STDOUT_CAPTURE
- OS_STDERR_CAPTURE
+ DOCKER_*
+ NODEPOOL_ZK_HOST
OS_LOG_CAPTURE
OS_LOG_DEFAULTS
- NODEPOOL_ZK_HOST
+ OS_STDERR_CAPTURE
+ OS_STDOUT_CAPTURE
ZUUL_MYSQL_HOST
ZUUL_POSTGRES_HOST
+ ZUUL_TEST_ROOT
usedevelop = True
whitelist_externals = bash
deps =
@@ -87,14 +88,15 @@ commands =
[testenv:remote]
passenv =
- ZUUL_TEST_ROOT
- OS_STDOUT_CAPTURE
- OS_STDERR_CAPTURE
+ DOCKER_*
+ NODEPOOL_ZK_HOST
OS_LOG_CAPTURE
OS_LOG_DEFAULTS
- NODEPOOL_ZK_HOST
+ OS_STDERR_CAPTURE
+ OS_STDOUT_CAPTURE
ZUUL_REMOTE_IPV4
ZUUL_SSH_KEY
+ ZUUL_TEST_ROOT
commands =
stestr run --test-path ./tests/remote {posargs}