From b9f759e9c1be95b66a18927456d112866c5a54bf Mon Sep 17 00:00:00 2001 From: Ross Brattain Date: Thu, 11 Jan 2018 15:03:23 -0800 Subject: pylint: try to change formatting for Jenkins again looks like we have to add var to tox passenv Change-Id: Iba2da2123ae531e026897308769aa832c7eb6d04 Signed-off-by: Ross Brattain --- tools/coding-checks.sh | 2 +- tox.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/coding-checks.sh b/tools/coding-checks.sh index 6a12a1e99..615f2c3de 100644 --- a/tools/coding-checks.sh +++ b/tools/coding-checks.sh @@ -40,7 +40,7 @@ run_pylint () { fi # make Jenkins output parseable because Jenkins doesn't handle color # enventually we should use the Jenkins Pylint plugin or other tools - if [ -n "${JENKINS_HOME:-}" ] ; then + if [ -n "${BRANCH:-}" ] ; then output_format="--output-format=parseable" fi echo "Running pylint..." diff --git a/tox.ini b/tox.ini index 9a82878b0..822ffdab4 100644 --- a/tox.ini +++ b/tox.ini @@ -5,7 +5,7 @@ envlist = py{27,3},pep8,functional{,-py3},coverage [testenv] usedevelop=True -passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY +passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY BRANCH deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt -- cgit 1.2.3-korg