diff --git a/Jenkinsfile b/Jenkinsfile index 12f36f3..5f899e9 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 a60fc94..263b7ec 100644 --- a/tox.ini +++ b/tox.ini @@ -11,7 +11,7 @@ setenv = pg: DB_ENGINE=postgresql_psycopg2 DJANGO_SETTINGS_MODULE=fargo.settings FARGO_SETTINGS_FILE=tests/settings.py - coverage: COVERAGE=--junitxml=test_results.xml --random --cov-report xml --cov-report html --cov=fargo/ + coverage: COVERAGE=--junitxml=junit-{envname}.xml --random --cov-report xml --cov-report html --cov=fargo/ deps = pytest>=3.3.0,<4.1 pg: psycopg2