summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiam Young <liam.young@canonical.com>2018-09-20 11:16:21 +0000
committerLiam Young <liam.young@canonical.com>2018-09-20 11:19:01 +0000
commita62f4a169f0a5b13b58830935d23c948566f10b8 (patch)
tree0afed6a4b6cfd282ecb00e2bb716e6ca02766d82
parent8316c09e4991cbc7039ed14886703155a9ff5c6e (diff)
Pass all CS_ vars to tox env to pickup timeoutHEADmaster
Notes
Notes (review): Verified+1: Canonical CI <uosci-testing-bot@ubuntu.com> Code-Review+2: Ryan Beisner <ryan.beisner@canonical.com> Workflow+1: Ryan Beisner <ryan.beisner@canonical.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Thu, 20 Sep 2018 13:31:28 +0000 Reviewed-on: https://review.openstack.org/604055 Project: openstack/charm-openvswitch-odl Branch: refs/heads/master
-rw-r--r--src/tox.ini2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tox.ini b/src/tox.ini
index d426771..f3e386e 100644
--- a/src/tox.ini
+++ b/src/tox.ini
@@ -10,7 +10,7 @@ setenv = VIRTUAL_ENV={envdir}
10 PYTHONHASHSEED=0 10 PYTHONHASHSEED=0
11 AMULET_SETUP_TIMEOUT=5400 11 AMULET_SETUP_TIMEOUT=5400
12whitelist_externals = juju 12whitelist_externals = juju
13passenv = HOME TERM AMULET_* CS_API_* 13passenv = HOME TERM AMULET_* CS_*
14deps = -r{toxinidir}/test-requirements.txt 14deps = -r{toxinidir}/test-requirements.txt
15install_command = 15install_command =
16 pip install {opts} {packages} 16 pip install {opts} {packages}