Jenkinsfile: use mergeJunitResults() (#38304)

This commit is contained in:
Benjamin Dauvergne 2019-12-09 13:31:27 +01:00
parent 8a6702066d
commit 5cca8ce560
2 changed files with 3 additions and 3 deletions

2
Jenkinsfile vendored
View File

@ -28,7 +28,7 @@ pipeline {
utils.publish_coverage('coverage.xml')
utils.publish_coverage_native('index.html')
}
junit '*_results.xml'
mergeJunitResults()
}
success {
cleanWs()

View File

@ -10,8 +10,8 @@ toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/eopayment/{env:BRANCH_NAME:}
[testenv]
# django.contrib.auth is not tested it does not work with our templates
commands =
py2: py.test {posargs: --junitxml=test_{envname}_results.xml --cov-report xml --cov-report html --cov=eopayment/ tests}
py3: py.test {posargs: --junitxml=test_{envname}_results.xml tests}
py2: py.test {posargs: --junitxml=junit-{envname}.xml --cov-report xml --cov-report html --cov=eopayment/ tests}
py3: py.test {posargs: --junitxml=junit-{envname}.xml tests}
usedevelop = True
deps = coverage
pytest