Hashar has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/369604 )
Change subject: Pass PY_COLORS for tox 2.0.0+
......................................................................
Pass PY_COLORS for tox 2.0.0+
tox 2.0.0 isolates environment variables, we need to set PY_COLORS=1 to
trigger color output on Jenkins jobs.
Use TOX_TESTENV_PASSENV to have tox pass PY_COLORS to the env.
Update:
apps-android-wikipedia-tox-jessie
integration-config-qa
integration-config-tox-dib-jessie
integration-config-tox-jessie
integration-jjb-config-diff
labs-tox-jessie
mw-tools-releng-tox-doc-publish
mw-tools-scap-tox-doc-publish
mwgate-tox-jessie
operations-puppet-tests-jessie
pywikibot-core-tox-doc-jessie
pywikibot-core-tox-doc-publish
pywikibot-core-tox-jessie
pywikibot-core-tox-nose-jessie
pywikibot-core-tox-nose34-jessie
pywikibot-wikibase-tox-nose-jessie
pywikibot-wikibase-tox-nose34-jessie
tox-doc-jessie
tox-jessie
tox-py27-coverage-publish
Bug: T169602
Change-Id: Ide76006d703b3ac83b395c57c56001e34d665703
---
M dockerfiles/contint-operations-puppet/run.sh
M jjb/integration.yaml
M jjb/macro.yaml
M jjb/python-jobs.yaml
4 files changed, 5 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/04/369604/1
diff --git a/dockerfiles/contint-operations-puppet/run.sh
b/dockerfiles/contint-operations-puppet/run.sh
index bff2ea4..f2441b8 100644
--- a/dockerfiles/contint-operations-puppet/run.sh
+++ b/dockerfiles/contint-operations-puppet/run.sh
@@ -43,7 +43,7 @@
# Run tox tests
{
set -o pipefail
- PY_COLORS=1 tox -v | tee "${LOG_DIR}/tox.log"
+ TOX_TESTENV_PASSENV=PY_COLORS PY_COLORS=1 tox -v | tee "${LOG_DIR}/tox.log"
set +o pipefail
} &
PID_ONE=$!
diff --git a/jjb/integration.yaml b/jjb/integration.yaml
index 843b97d..01a0188 100644
--- a/jjb/integration.yaml
+++ b/jjb/integration.yaml
@@ -108,6 +108,7 @@
# enforce tox color output:
export PY_COLORS=1
+ export TOX_TESTENV_PASSENV=PY_COLORS
echo "Generating config for proposed patchset..."
tox -v -e venv -- jenkins-jobs test "$WORKSPACE/config/jjb" -o
"$WORKSPACE/output-proposed"
diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index 02fc665..6513e58 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -468,7 +468,7 @@
rm -fR log
mkdir -p log
set -o pipefail
- PY_COLORS=1 tox -v -e "{venv}" | tee "log/{venv}.log"
+ TOX_TESTENV_PASSENV=PY_COLORS PY_COLORS=1 tox -v -e "{venv}" | tee
"log/{venv}.log"
set +o pipefail
- builder:
@@ -478,7 +478,7 @@
rm -fR log
mkdir -p log
set -o pipefail
- PY_COLORS=1 tox -v | tee "log/stdout.log"
+ TOX_TESTENV_PASSENV=PY_COLORS PY_COLORS=1 tox -v | tee
"log/stdout.log"
set +o pipefail
- publisher:
diff --git a/jjb/python-jobs.yaml b/jjb/python-jobs.yaml
index 339c66b..9303e55 100644
--- a/jjb/python-jobs.yaml
+++ b/jjb/python-jobs.yaml
@@ -91,7 +91,7 @@
rm -fR coverage log
mkdir -p log
set -o pipefail
- PY_COLORS=1 tox -e py27 -- --cover-html --cover-html-dir=coverage/ |
tee "log/tox-coverage.log"
+ TOX_TESTENV_PASSENV=PY_COLORS PY_COLORS=1 tox -e py27 -- --cover-html
--cover-html-dir=coverage/ | tee "log/tox-coverage.log"
set +o pipefail
- cover-publish:
src: 'coverage'
--
To view, visit https://gerrit.wikimedia.org/r/369604
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ide76006d703b3ac83b395c57c56001e34d665703
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
