Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Do not start collectd twice when SampleVNF is running on Baremetal" into stabl...
[yardstick.git]
/
tox.ini
diff --git
a/tox.ini
b/tox.ini
index
9a82878
..
313f1ec
100644
(file)
--- a/
tox.ini
+++ b/
tox.ini
@@
-5,7
+5,9
@@
envlist = py{27,3},pep8,functional{,-py3},coverage
[testenv]
usedevelop=True
[testenv]
usedevelop=True
-passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
+passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY BRANCH
+setenv =
+ VIRTUAL_ENV={envdir}
deps =
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
deps =
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt