diff --git a/Jenkinsfile b/Jenkinsfile index 33e35354..be0efbbb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,7 @@ pipeline { utils.publish_coverage_native('index.html') utils.publish_pylint('pylint.out') } - junit '*_results.xml' + mergeJunitResults() } } } diff --git a/tox.ini b/tox.ini index 331f37e0..a804ffe2 100644 --- a/tox.ini +++ b/tox.ini @@ -34,5 +34,5 @@ commands = py3: ./getlasso3.sh py2: ./get_wcs.sh python manage.py compilemessages - py.test {env:COVERAGE:} {posargs: --junitxml=test_{envname}_results.xml tests/} + py.test {env:COVERAGE:} {posargs: --junitxml=junit-{envname}.xml tests/} pylint: ./pylint.sh combo/