Merge "Pass proxy environment variables to tox"

diff --cc tox.ini
index bcb1a9e6b4a989a92f7a8b72f0844926db176855,0e18f68299e751333c9f07a218c96b547c9a340a..c433451f1dfab34ee3726ecfdf1ac42779544653
--- 1/tox.ini
--- 2/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