diff --git a/Jenkinsfile b/Jenkinsfile index 6ee53da..acbba42 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,15 +14,15 @@ pipeline { utils = new Utils() utils.publish_coverage('coverage-*.xml') utils.publish_coverage_native( - 'index.html', 'htmlcov-py2-coverage-authentic', 'Coverage authentic tests') + 'index.html', 'htmlcov-py3-coverage-authentic', 'Coverage authentic tests') utils.publish_coverage_native( - 'index.html', 'htmlcov-py2-coverage-hobo', 'Coverage hobo tests') + 'index.html', 'htmlcov-py3-coverage-hobo', 'Coverage hobo tests') utils.publish_coverage_native( - 'index.html', 'htmlcov-py2-coverage-multipublik', 'Coverage multipublik tests') + 'index.html', 'htmlcov-py3-coverage-multipublik', 'Coverage multipublik tests') utils.publish_coverage_native( - 'index.html', 'htmlcov-py2-coverage-multitenant', 'Coverage multitenant tests') + 'index.html', 'htmlcov-py3-coverage-multitenant', 'Coverage multitenant tests') utils.publish_coverage_native( - 'index.html', 'htmlcov-py2-coverage-passerelle', 'Coverage passerelle tests') + 'index.html', 'htmlcov-py3-coverage-passerelle', 'Coverage passerelle tests') utils.publish_pylint('pylint.out') } mergeJunitResults() diff --git a/tox.ini b/tox.ini index 6588bb7..f5906ac 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,7 @@ # and then run "tox" from this directory. [tox] toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/hobo/{env:BRANCH_NAME:} -envlist = py2-coverage-{authentic,hobo,multipublik,multitenant,multitenant-oldstylemiddleware,passerelle,schemas}, py3-coverage-{hobo,multipublik,multitenant,multitenant-oldstylemiddleware,passerelle,schemas} +envlist = {py2,py3-coverage}-{authentic,hobo,multipublik,multitenant,multitenant-oldstylemiddleware,passerelle,schemas} [testenv] usedevelop = True