From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 16 Jun 2015 15:46:08 +0000 (+0000)
Subject: Merge "Pass proxy environment variables to tox"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=8fede3150704dc38d6fda3c2d0004ecde15f630f;p=openstack-build%2Fcinder-build.git

Merge "Pass proxy environment variables to tox"
---

8fede3150704dc38d6fda3c2d0004ecde15f630f
diff --cc tox.ini
index bcb1a9e6b,0e18f6829..c433451f1
--- a/tox.ini
+++ b/tox.ini
@@@ -13,15 -13,10 +13,16 @@@ install_command = pip install {opts} {p
  
  deps = -r{toxinidir}/requirements.txt
         -r{toxinidir}/test-requirements.txt
 -commands =
 -  bash tools/pretty_tox.sh '{posargs}'
 +
 +# Note, we set concurrency to 6 here as a default
 +# ostestr will take the last entry for occurence
 +# so if you want to increase/decrease this you
 +# can simply add concurrency arg to your tox
 +# call ie: 'tox -epy27 -- --concurrency=4'
 +commands = ostestr --concurrency=6 {posargs}
 +
  whitelist_externals = bash
+ passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
  
  [tox:jenkins]
  downloadcache = ~/cache/pip