From 5cca8ce560c9356b7a14573d5173dfd989b2cb56 Mon Sep 17 00:00:00 2001
From: Benjamin Dauvergne <bdauvergne@entrouvert.com>
Date: Mon, 9 Dec 2019 13:31:27 +0100
Subject: [PATCH] Jenkinsfile: use mergeJunitResults() (#38304)

---
 Jenkinsfile | 2 +-
 tox.ini     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index f9b6af1..4a9380a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -28,7 +28,7 @@ pipeline {
                 utils.publish_coverage('coverage.xml')
                 utils.publish_coverage_native('index.html')
             }
-            junit '*_results.xml'
+            mergeJunitResults()
         }
         success {
             cleanWs()
diff --git a/tox.ini b/tox.ini
index cf83924..f38d65d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -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