Hashar has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/387682 )
Change subject: docker: pass all env variables to tox
......................................................................
docker: pass all env variables to tox
That will let us add extra environment variables from a job definition
and also let child images add extra variables before the entrypoint.
Change-Id: I70334e52c2e3a4754c80cd0886c41a2f3e1ad937
---
M dockerfiles/tox/run.sh
M jjb/python-jobs.yaml
2 files changed, 4 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/82/387682/1
diff --git a/dockerfiles/tox/run.sh b/dockerfiles/tox/run.sh
index f9a3d0f..73df486 100644
--- a/dockerfiles/tox/run.sh
+++ b/dockerfiles/tox/run.sh
@@ -26,5 +26,6 @@
git checkout --quiet FETCH_HEAD
git submodule --quiet update --init --recursive
-# Run tests
-TOX_TESTENV_PASSENV="PY_COLORS XDG_CACHE_HOME" PY_COLORS=1 tox -v | tee
"${LOG_DIR}/stdout.log"
+# Run tests. Pass all environment variables to tox since the environment here
+# is already pretty restrictive.
+TOX_TESTENV_PASSENV="*" PY_COLORS=1 tox -v | tee "${LOG_DIR}/stdout.log"
diff --git a/jjb/python-jobs.yaml b/jjb/python-jobs.yaml
index 618d098..da52b24 100644
--- a/jjb/python-jobs.yaml
+++ b/jjb/python-jobs.yaml
@@ -75,7 +75,7 @@
- docker-zuul-env
- docker-log-dir
- docker-run-with-log-and-workspace-cache:
- image: 'wmfreleng/tox:v2017.10.31.15.21'
+ image: 'wmfreleng/tox:v2017.10.31.21.03'
logdir: '/log'
wrappers:
- timeout:
--
To view, visit https://gerrit.wikimedia.org/r/387682
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I70334e52c2e3a4754c80cd0886c41a2f3e1ad937
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
