summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Dauvergne <bdauvergne@entrouvert.com>2019-12-09 14:41:13 (GMT)
committerBenjamin Dauvergne <bdauvergne@entrouvert.com>2019-12-09 14:42:08 (GMT)
commitd7231c90023c53092bcab32cdde0d3c75add4c71 (patch)
tree4e4eec8cf36b0735577d934d87b00e2d9debaebb
parent1c810c703b37bc0054cd7b2891254c3d30ae2afc (diff)
downloadwelco-wip/38317-Jenkinsfile-utiliser-mergeJunitR.zip
welco-wip/38317-Jenkinsfile-utiliser-mergeJunitR.tar.gz
welco-wip/38317-Jenkinsfile-utiliser-mergeJunitR.tar.bz2
Jenkinsfile: use mergeJunitResults() (#38317)wip/38317-Jenkinsfile-utiliser-mergeJunitR
-rw-r--r--Jenkinsfile2
-rw-r--r--tox.ini2
2 files changed, 2 insertions, 2 deletions
diff --git a/Jenkinsfile b/Jenkinsfile
index f577237..86e03fa 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 f9a5ac4..dca5a89 100644
--- a/tox.ini
+++ b/tox.ini
@@ -27,4 +27,4 @@ deps =
git+https://git.entrouvert.org/debian/django-ckeditor.git
commands =
django111: ./pylint.sh welco/
- django111: py.test {posargs: --junitxml=test_{envname}_results.xml --cov-report xml --cov-report html --cov=welco/ tests/}
+ django111: py.test {posargs: --junitxml=junit-{envname}.xml --cov-report xml --cov-report html --cov=welco/ tests/}