diff --git a/.azure-pipelines/templates/jobs/extended-tests-jobs.yml b/.azure-pipelines/templates/jobs/extended-tests-jobs.yml index ab15c8c8d..09d0e22c7 100644 --- a/.azure-pipelines/templates/jobs/extended-tests-jobs.yml +++ b/.azure-pipelines/templates/jobs/extended-tests-jobs.yml @@ -18,7 +18,7 @@ jobs: PYTHON_VERSION: 3.11 TOXENV: py311 linux-isolated: - TOXENV: 'isolated-{acme,certbot,apache,cloudflare,digitalocean,dnsimple,dnsmadeeasy,gehirn,google,linode,luadns,nsone,ovh,rfc2136,route53,sakuracloud,nginx}' + TOXENV: 'isolated-acme,isolated-certbot,isolated-apache,isolated-cloudflare,isolated-digitalocean,isolated-dnsimple,isolated-dnsmadeeasy,isolated-gehirn,isolated-google,isolated-linode,isolated-luadns,isolated-nsone,isolated-ovh,isolated-rfc2136,isolated-route53,isolated-sakuracloud,isolated-nginx' linux-boulder-v2-integration-certbot-oldest: PYTHON_VERSION: 3.8 TOXENV: integration-certbot-oldest diff --git a/.azure-pipelines/templates/steps/tox-steps.yml b/.azure-pipelines/templates/steps/tox-steps.yml index 6a257821b..156bbeaa2 100644 --- a/.azure-pipelines/templates/steps/tox-steps.yml +++ b/.azure-pipelines/templates/steps/tox-steps.yml @@ -44,7 +44,7 @@ steps: export TARGET_BRANCH="`echo "${BUILD_SOURCEBRANCH}" | sed -E 's!refs/(heads|tags)/!!g'`" [ -z "${SYSTEM_PULLREQUEST_TARGETBRANCH}" ] || export TARGET_BRANCH="${SYSTEM_PULLREQUEST_TARGETBRANCH}" env - python3 -m tox + python3 -m tox run env: AWS_ACCESS_KEY_ID: $(AWS_ACCESS_KEY_ID) AWS_SECRET_ACCESS_KEY: $(AWS_SECRET_ACCESS_KEY) diff --git a/tox.ini b/tox.ini index 5e923dfd0..6b710906e 100644 --- a/tox.ini +++ b/tox.ini @@ -2,6 +2,7 @@ # mypy doesn't current pass for us on Windows. Fixing that is being tracked by # https://github.com/certbot/certbot/issues/7803. envlist = {cover,lint}-{win,posix},mypy + skipsdist = true [base] @@ -99,6 +100,7 @@ commands = {[testenv:cover]coverage_report} --fail-under 100 --include certbot-apache/* {[testenv:cover]common_coverage_report_commands} +# Another workaround for https://github.com/tox-dev/tox/issues/2858 in tox v4. [testenv:cover-posix] commands = {[testenv:cover]commands}