Jenkinsfile: use mergeJunitResults() (#38317 )

2019-12-09 15:42:08 +01:00
2 changed files with 2 additions and 2 deletions
--- a/2
+++ b/2
@ -16,7 +16,7 @@ pipeline {
                        utils.publish_coverage_native('index.html')
                        utils.publish_pylint('pylint.out')
                    }
-                    junit '*_results.xml'
+                    mergeJunitResults()
                }
            }
        }
--- 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/}