From 58ff63572dfeb8a81431b8adf6cf12755302ed11 Mon Sep 17 00:00:00 2001
From: Benjamin Dauvergne <bdauvergne@entrouvert.com>
Date: Mon, 9 Dec 2019 15:37:45 +0100
Subject: [PATCH] Jenkinsfile: use mergeJunitResults() (#38315)

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 9cf6c04c..06a381e9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -15,7 +15,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 044aba22..679afc81 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,7 +9,7 @@ usedevelop =
 setenv =
   DJANGO_SETTINGS_MODULE=chrono.settings
   CHRONO_SETTINGS_FILE=tests/settings.py
-  coverage: COVERAGE=--junitxml=test_results.xml --cov-report xml --cov-report html --cov=chrono/
+  coverage: COVERAGE=--junitxml=junit-{envname}.xml --cov-report xml --cov-report html --cov=chrono/
 deps =
   pytest-cov
   pytest-django