From d7231c90023c53092bcab32cdde0d3c75add4c71 Mon Sep 17 00:00:00 2001
From: Benjamin Dauvergne <bdauvergne@entrouvert.com>
Date: Mon, 9 Dec 2019 15:41:13 +0100
Subject: [PATCH] Jenkinsfile: use mergeJunitResults() (#38317)

---
 Jenkinsfile | 2 +-
 tox.ini     | 2 +-
 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/}
-- 
2.23.0