summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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/}