pylint: try to change formatting for Jenkins again 59/50459/1
authorRoss Brattain <ross.b.brattain@intel.com>
Thu, 11 Jan 2018 23:03:23 +0000 (15:03 -0800)
committerRoss Brattain <ross.b.brattain@intel.com>
Thu, 11 Jan 2018 23:03:54 +0000 (15:03 -0800)
looks like we have to add var to tox passenv

Change-Id: Iba2da2123ae531e026897308769aa832c7eb6d04
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
tools/coding-checks.sh
tox.ini

index 6a12a1e..615f2c3 100644 (file)
@@ -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 9a82878..822ffda 100644 (file)
--- 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