mirror of
https://github.com/certbot/certbot.git
synced 2026-08-02 19:42:02 +02:00
Replace boulder tests with pebble (#9918)
Pebble 2.5.1 supports OCSP stapling, so we can finally replace all boulder tests/harnesses with the much simpler pebble setup. Closes #9898 * Remove unused `--acme-server` argument Since this argument is never set and always defaults to 'pebble', just remove it to simplify assumptions about which test server's being used. * Remove boulder option from integration tests Now that pebble supports all of our test cases, we can move off of the much more complicated boulder test harness. * pebble_artifacts: bump to latest pebble release * pebble_artifacts: fix download path * certbot-ci: unzip pebble assets * CI: rip out windows tests/jobs * tox.ini: rm outdated Windows comment Co-authored-by: Brad Warren <bmw@users.noreply.github.com> * ci: rm redundant integration test Co-authored-by: Brad Warren <bmw@users.noreply.github.com> * acme_server: raise error if proxy and http-01 port are both set * acme_server: rm vestigial preterimate commands stuff --------- Co-authored-by: Brad Warren <bmw@users.noreply.github.com>
This commit is contained in:
Will Greenberg
co-authored by
Brad Warren
Brad Warren
parent
2a41402f2a
commit
873f979a25
@@ -1,7 +1,5 @@
|
||||
[tox]
|
||||
# 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
|
||||
envlist = {cover,lint}-posix,mypy
|
||||
|
||||
skipsdist = true
|
||||
|
||||
@@ -10,11 +8,10 @@ pytest = python -m pytest {posargs}
|
||||
# Paths are listed on one line because tox seems to have inconsistent
|
||||
# behavior with substitutions that contain line continuations, see
|
||||
# https://github.com/tox-dev/tox/issues/2069 for more info.
|
||||
source_paths = acme/acme certbot/certbot certbot-apache/certbot_apache certbot-ci/certbot_integration_tests certbot-ci/snap_integration_tests certbot-ci/windows_installer_integration_tests certbot-compatibility-test/certbot_compatibility_test certbot-dns-cloudflare/certbot_dns_cloudflare certbot-dns-digitalocean/certbot_dns_digitalocean certbot-dns-dnsimple/certbot_dns_dnsimple certbot-dns-dnsmadeeasy/certbot_dns_dnsmadeeasy certbot-dns-gehirn/certbot_dns_gehirn certbot-dns-google/certbot_dns_google certbot-dns-linode/certbot_dns_linode certbot-dns-luadns/certbot_dns_luadns certbot-dns-nsone/certbot_dns_nsone certbot-dns-ovh/certbot_dns_ovh certbot-dns-rfc2136/certbot_dns_rfc2136 certbot-dns-route53/certbot_dns_route53 certbot-dns-sakuracloud/certbot_dns_sakuracloud certbot-nginx/certbot_nginx
|
||||
source_paths = acme/acme certbot/certbot certbot-apache/certbot_apache certbot-ci/certbot_integration_tests certbot-ci/snap_integration_tests certbot-compatibility-test/certbot_compatibility_test certbot-dns-cloudflare/certbot_dns_cloudflare certbot-dns-digitalocean/certbot_dns_digitalocean certbot-dns-dnsimple/certbot_dns_dnsimple certbot-dns-dnsmadeeasy/certbot_dns_dnsmadeeasy certbot-dns-gehirn/certbot_dns_gehirn certbot-dns-google/certbot_dns_google certbot-dns-linode/certbot_dns_linode certbot-dns-luadns/certbot_dns_luadns certbot-dns-nsone/certbot_dns_nsone certbot-dns-ovh/certbot_dns_ovh certbot-dns-rfc2136/certbot_dns_rfc2136 certbot-dns-route53/certbot_dns_route53 certbot-dns-sakuracloud/certbot_dns_sakuracloud certbot-nginx/certbot_nginx
|
||||
|
||||
[testenv]
|
||||
platform =
|
||||
win: win32
|
||||
posix: ^(?!.*win32).*$
|
||||
setenv =
|
||||
PYTEST_ADDOPTS = {env:PYTEST_ADDOPTS:--numprocesses auto}
|
||||
@@ -25,7 +22,7 @@ deps =
|
||||
-e acme[test]
|
||||
-e certbot
|
||||
-e certbot[test]
|
||||
!win: -e certbot-apache[dev]
|
||||
-e certbot-apache[dev]
|
||||
-e certbot-dns-cloudflare
|
||||
-e certbot-dns-digitalocean
|
||||
-e certbot-dns-dnsimple
|
||||
@@ -49,14 +46,9 @@ commands =
|
||||
echo "Unrecognized environment name {envname}"
|
||||
false
|
||||
|
||||
[testenv:py-win]
|
||||
commands =
|
||||
{[base]pytest} acme certbot certbot-dns-cloudflare certbot-dns-digitalocean certbot-dns-dnsimple certbot-dns-dnsmadeeasy certbot-dns-gehirn certbot-dns-google certbot-dns-linode certbot-dns-luadns certbot-dns-nsone certbot-dns-ovh certbot-dns-rfc2136 certbot-dns-route53 certbot-dns-sakuracloud certbot-nginx
|
||||
|
||||
[testenv:py{,-posix}]
|
||||
# We want to test everything we do on Windows plus the Apache plugin.
|
||||
commands =
|
||||
{[testenv:py-win]commands} certbot-apache
|
||||
{[base]pytest} acme certbot certbot-dns-cloudflare certbot-dns-digitalocean certbot-dns-dnsimple certbot-dns-dnsmadeeasy certbot-dns-gehirn certbot-dns-google certbot-dns-linode certbot-dns-luadns certbot-dns-nsone certbot-dns-ovh certbot-dns-rfc2136 certbot-dns-route53 certbot-dns-sakuracloud certbot-nginx certbot-apache
|
||||
|
||||
[testenv:py3{,8,9,10,11,12}]
|
||||
commands = {[testenv:py]commands}
|
||||
@@ -77,7 +69,6 @@ commands = {[testenv:py]commands}
|
||||
|
||||
[testenv:cover]
|
||||
coverage_report = python -m coverage report
|
||||
# These coverage report commands are used on both posix and windows
|
||||
common_coverage_report_commands =
|
||||
{[testenv:cover]coverage_report} --fail-under 99 --include certbot-dns-cloudflare/*
|
||||
{[testenv:cover]coverage_report} --fail-under 99 --include certbot-dns-digitalocean/*
|
||||
@@ -104,14 +95,7 @@ commands =
|
||||
[testenv:cover-posix]
|
||||
commands = {[testenv:cover]commands}
|
||||
|
||||
[testenv:cover-win]
|
||||
commands =
|
||||
{[testenv:py-win]commands} --cov --cov-report=
|
||||
{[testenv:cover]coverage_report} --fail-under 99 --include acme/*
|
||||
{[testenv:cover]coverage_report} --fail-under 96 --include certbot/*
|
||||
{[testenv:cover]common_coverage_report_commands}
|
||||
|
||||
[testenv:lint{,-win,-posix}]
|
||||
[testenv:lint{,-posix}]
|
||||
commands = python -m pylint --reports=n --rcfile=.pylintrc {[base]source_paths}
|
||||
|
||||
[testenv:mypy]
|
||||
@@ -241,7 +225,6 @@ deps =
|
||||
-e certbot-ci
|
||||
commands =
|
||||
{[base]pytest} certbot-ci/certbot_integration_tests \
|
||||
--acme-server={env:ACME_SERVER:pebble} \
|
||||
--cov=acme --cov=certbot --cov=certbot_nginx --cov-report= \
|
||||
--cov-config=certbot-ci/certbot_integration_tests/.coveragerc
|
||||
coverage report --include 'certbot/*' --show-missing --fail-under=65
|
||||
@@ -255,7 +238,6 @@ deps =
|
||||
-e certbot-ci
|
||||
commands =
|
||||
{[base]pytest} certbot-ci/certbot_integration_tests/certbot_tests \
|
||||
--acme-server={env:ACME_SERVER:pebble} \
|
||||
--cov=acme --cov=certbot --cov-report= \
|
||||
--cov-config=certbot-ci/certbot_integration_tests/.coveragerc
|
||||
coverage report --include 'certbot/*' --show-missing --fail-under=62
|
||||
@@ -268,7 +250,7 @@ deps =
|
||||
-e certbot-ci
|
||||
commands =
|
||||
{[base]pytest} certbot-ci/certbot_integration_tests/rfc2136_tests \
|
||||
--acme-server=pebble --dns-server=bind \
|
||||
--dns-server=bind \
|
||||
--numprocesses=1 \
|
||||
--cov=acme --cov=certbot --cov=certbot_dns_rfc2136 --cov-report= \
|
||||
--cov-config=certbot-ci/certbot_integration_tests/.coveragerc
|
||||
@@ -280,8 +262,7 @@ description = Run integration tests with Certbot outside of the tox virtual envi
|
||||
deps =
|
||||
-e certbot-ci
|
||||
commands =
|
||||
{[base]pytest} certbot-ci/certbot_integration_tests \
|
||||
--acme-server={env:ACME_SERVER:pebble}
|
||||
{[base]pytest} certbot-ci/certbot_integration_tests
|
||||
passenv = DOCKER_*
|
||||
|
||||
[testenv:integration-certbot-oldest]
|
||||
@@ -292,8 +273,7 @@ deps =
|
||||
basepython =
|
||||
{[testenv:oldest]basepython}
|
||||
commands =
|
||||
{[base]pytest} certbot-ci/certbot_integration_tests/certbot_tests \
|
||||
--acme-server={env:ACME_SERVER:pebble}
|
||||
{[base]pytest} certbot-ci/certbot_integration_tests/certbot_tests
|
||||
passenv = DOCKER_*
|
||||
setenv = {[testenv:oldest]setenv}
|
||||
|
||||
@@ -306,8 +286,7 @@ deps =
|
||||
basepython =
|
||||
{[testenv:oldest]basepython}
|
||||
commands =
|
||||
{[base]pytest} certbot-ci/certbot_integration_tests/nginx_tests \
|
||||
--acme-server={env:ACME_SERVER:pebble}
|
||||
{[base]pytest} certbot-ci/certbot_integration_tests/nginx_tests
|
||||
passenv = DOCKER_*
|
||||
setenv = {[testenv:oldest]setenv}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user