summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbst-marge-bot <marge-bot@buildstream.build>2019-03-06 18:40:50 +0000
committerbst-marge-bot <marge-bot@buildstream.build>2019-03-06 18:40:50 +0000
commit5370740fc1eef6daf144831b148f13f883ebcd42 (patch)
tree65a7a9b1743f2193397046aeccb8548f06799d07
parent3fd758faffc1851e007596ce177275f84169deaa (diff)
parentfde70e7c785f16c456e3d861624aa0f519cfb918 (diff)
downloadbuildstream-5370740fc1eef6daf144831b148f13f883ebcd42.tar.gz
Merge branch 'bschubert/tests-behind-proxy' into 'master'
test: Pass proxy and cert env variable to tox environment See merge request BuildStream/buildstream!1207
-rw-r--r--tox.ini7
1 files changed, 7 insertions, 0 deletions
diff --git a/tox.ini b/tox.ini
index 78e491973..5057c7c99 100644
--- a/tox.ini
+++ b/tox.ini
@@ -30,6 +30,13 @@ passenv =
BST_FORCE_BACKEND
GI_TYPELIB_PATH
INTEGRATION_CACHE
+ http_proxy
+ HTTP_PROXY
+ https_proxy
+ HTTPS_PROXY
+ no_proxy
+ NO_PROXY
+ SSL_CERT_FILE
#
# These keys are not inherited by any other sections