Jenkinsfile: use mergeJunitResults() (#38312)

2019-12-09 15:31:07 +01:00 · 2019-12-09 15:31:07 +01:00 · 037ee9863d
parent 5fafd3b13b
commit 037ee9863d
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
@ -34,5 +34,5 @@ commands =
  py3: ./getlasso3.sh
  py2: ./get_wcs.sh
  python manage.py compilemessages
-  py.test {env:COVERAGE:} {posargs: --junitxml=test_{envname}_results.xml tests/}
+  py.test {env:COVERAGE:} {posargs: --junitxml=junit-{envname}.xml tests/}
  pylint: ./pylint.sh combo/