jenkins-bot has submitted this change and it was merged. ( 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. Requires tox to be bumped to 2.6.0: From https://tox.readthedocs.io/en/latest/changelog.html > 2.6.0 > fix glob resolution from TOX_TESTENV_PASSENV env variable > pass setenv variables to setup.py during a usedevelop install. Change-Id: I70334e52c2e3a4754c80cd0886c41a2f3e1ad937 --- M dockerfiles/tox/Dockerfile M dockerfiles/tox/run.sh M jjb/python-jobs.yaml 3 files changed, 5 insertions(+), 4 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/dockerfiles/tox/Dockerfile b/dockerfiles/tox/Dockerfile index ab346b0..88131c2 100644 --- a/dockerfiles/tox/Dockerfile +++ b/dockerfiles/tox/Dockerfile @@ -13,7 +13,7 @@ RUN pip install pip==8.1.2 && \ apt-get remove --yes --purge python-pip python3-pip && \ ln -s /usr/local/bin/pip /usr/bin/pip && \ - pip install tox==2.5.0 && \ + pip install tox==2.6.0 && \ pip install setuptools && \ rm -fR "$XDG_CACHE_HOME/pip" 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..eaef708 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.22.51' logdir: '/log' wrappers: - timeout: -- To view, visit https://gerrit.wikimedia.org/r/387682 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I70334e52c2e3a4754c80cd0886c41a2f3e1ad937 Gerrit-PatchSet: 2 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar <[email protected]> Gerrit-Reviewer: EBernhardson <[email protected]> Gerrit-Reviewer: Hashar <[email protected]> Gerrit-Reviewer: Paladox <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
