From feb493eb338756bc149d98d9b61cb93d7c5a0f6d Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Wed, 22 Mar 2017 23:52:33 +0100 Subject: [PATCH] jenkins.sh; add flag -r to tox --- jenkins.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jenkins.sh b/jenkins.sh index ce31f3b..795bbae 100755 --- a/jenkins.sh +++ b/jenkins.sh @@ -5,9 +5,11 @@ set -e rm -f coverage.xml rm -f test_results.xml +pip install --upgrade setuptools +pip install --upgrade pip pip install --upgrade tox pylint pylint-django -tox +tox -r ./merge-junit-results.py junit-*.xml >junit.xml ./merge-coverage.py -o coverage.xml coverage-*.xml