diff options
author | alexzorin <alex@zorin.id.au> | 2021-12-13 21:42:15 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-13 21:42:15 +0300 |
commit | 3353c0df431c71ee9cd15f2e91f41f2220c222eb (patch) | |
tree | 4157026e968691af9ac27b8a4abe9068a6f03d9c | |
parent | 97d9e2c97dbb2a57cc9a5d0374376e98b359d11c (diff) |
tests: remove Boulder v1 endpoint from certbot-ci and azure (#9140)
5 files changed, 9 insertions, 42 deletions
diff --git a/.azure-pipelines/templates/jobs/extended-tests-jobs.yml b/.azure-pipelines/templates/jobs/extended-tests-jobs.yml index 482f3ae8b..e10f2790e 100644 --- a/.azure-pipelines/templates/jobs/extended-tests-jobs.yml +++ b/.azure-pipelines/templates/jobs/extended-tests-jobs.yml @@ -26,58 +26,30 @@ jobs: CERTBOT_NO_PIN: 1 linux-external-mock: TOXENV: external-mock - linux-boulder-v1-integration-certbot-oldest: - PYTHON_VERSION: 3.6 - TOXENV: integration-certbot-oldest - ACME_SERVER: boulder-v1 linux-boulder-v2-integration-certbot-oldest: PYTHON_VERSION: 3.6 TOXENV: integration-certbot-oldest ACME_SERVER: boulder-v2 - linux-boulder-v1-integration-nginx-oldest: - PYTHON_VERSION: 3.6 - TOXENV: integration-nginx-oldest - ACME_SERVER: boulder-v1 linux-boulder-v2-integration-nginx-oldest: PYTHON_VERSION: 3.6 TOXENV: integration-nginx-oldest ACME_SERVER: boulder-v2 - linux-boulder-v1-py36-integration: - PYTHON_VERSION: 3.6 - TOXENV: integration - ACME_SERVER: boulder-v1 linux-boulder-v2-py36-integration: PYTHON_VERSION: 3.6 TOXENV: integration ACME_SERVER: boulder-v2 - linux-boulder-v1-py37-integration: - PYTHON_VERSION: 3.7 - TOXENV: integration - ACME_SERVER: boulder-v1 linux-boulder-v2-py37-integration: PYTHON_VERSION: 3.7 TOXENV: integration ACME_SERVER: boulder-v2 - linux-boulder-v1-py38-integration: - PYTHON_VERSION: 3.8 - TOXENV: integration - ACME_SERVER: boulder-v1 linux-boulder-v2-py38-integration: PYTHON_VERSION: 3.8 TOXENV: integration ACME_SERVER: boulder-v2 - linux-boulder-v1-py39-integration: - PYTHON_VERSION: 3.9 - TOXENV: integration - ACME_SERVER: boulder-v1 linux-boulder-v2-py39-integration: PYTHON_VERSION: 3.9 TOXENV: integration ACME_SERVER: boulder-v2 - linux-boulder-v1-py310-integration: - PYTHON_VERSION: 3.10 - TOXENV: integration - ACME_SERVER: boulder-v1 linux-boulder-v2-py310-integration: PYTHON_VERSION: 3.10 TOXENV: integration diff --git a/certbot-ci/certbot_integration_tests/certbot_tests/test_main.py b/certbot-ci/certbot_integration_tests/certbot_tests/test_main.py index 0e3a08c8c..d04fbff6c 100644 --- a/certbot-ci/certbot_integration_tests/certbot_tests/test_main.py +++ b/certbot-ci/certbot_integration_tests/certbot_tests/test_main.py @@ -512,7 +512,7 @@ def test_default_curve_type(context: IntegrationTestsContext) -> None: # Curve name, Curve class, ACME servers to skip ('secp256r1', SECP256R1, []), ('secp384r1', SECP384R1, []), - ('secp521r1', SECP521R1, ['boulder-v1', 'boulder-v2'])] + ('secp521r1', SECP521R1, ['boulder-v2'])] ) def test_ecdsa_curves(context: IntegrationTestsContext, curve: str, curve_cls: Type[EllipticCurve], skip_servers: Iterable[str]) -> None: @@ -689,9 +689,6 @@ def test_revoke_multiple_lineages(context: IntegrationTestsContext) -> None: def test_wildcard_certificates(context: IntegrationTestsContext) -> None: """Test wildcard certificate issuance.""" - if context.acme_server == 'boulder-v1': - pytest.skip('Wildcard certificates are not supported on ACME v1') - certname = context.get_domain('wild') context.certbot([ diff --git a/certbot-ci/certbot_integration_tests/conftest.py b/certbot-ci/certbot_integration_tests/conftest.py index deb9a5228..508aef04f 100644 --- a/certbot-ci/certbot_integration_tests/conftest.py +++ b/certbot-ci/certbot_integration_tests/conftest.py @@ -21,9 +21,9 @@ def pytest_addoption(parser): :param parser: current pytest parser that will be used on the CLI """ parser.addoption('--acme-server', default='pebble', - choices=['boulder-v1', 'boulder-v2', 'pebble'], - help='select the ACME server to use (boulder-v1, boulder-v2, ' - 'pebble), defaulting to pebble') + choices=['boulder-v2', 'pebble'], + help='select the ACME server to use (boulder-v2, pebble), ' + 'defaulting to pebble') parser.addoption('--dns-server', default='challtestsrv', choices=['bind', 'challtestsrv'], help='select the DNS server to use (bind, challtestsrv), ' diff --git a/certbot-ci/certbot_integration_tests/utils/acme_server.py b/certbot-ci/certbot_integration_tests/utils/acme_server.py index 611b33d0c..cff6ca3da 100755 --- a/certbot-ci/certbot_integration_tests/utils/acme_server.py +++ b/certbot-ci/certbot_integration_tests/utils/acme_server.py @@ -47,7 +47,7 @@ class ACMEServer: http_01_port: int = DEFAULT_HTTP_01_PORT) -> None: """ Create an ACMEServer instance. - :param str acme_server: the type of acme server used (boulder-v1, boulder-v2 or pebble) + :param str acme_server: the type of acme server used (boulder-v2 or pebble) :param list nodes: list of node names that will be setup by pytest xdist :param bool http_proxy: if False do not start the HTTP proxy :param bool stdout: if True stream all subprocesses stdout to standard stdout @@ -130,8 +130,7 @@ class ACMEServer: if acme_server == 'pebble': acme_xdist['directory_url'] = PEBBLE_DIRECTORY_URL else: # boulder - acme_xdist['directory_url'] = BOULDER_V2_DIRECTORY_URL \ - if acme_server == 'boulder-v2' else BOULDER_V1_DIRECTORY_URL + acme_xdist['directory_url'] = BOULDER_V2_DIRECTORY_URL acme_xdist['http_port'] = { node: port for (node, port) in # pylint: disable=unnecessary-comprehension @@ -267,9 +266,9 @@ def main() -> None: parser = argparse.ArgumentParser( description='CLI tool to start a local instance of Pebble or Boulder CA server.') parser.add_argument('--server-type', '-s', - choices=['pebble', 'boulder-v1', 'boulder-v2'], default='pebble', - help='type of CA server to start: can be Pebble or Boulder ' - '(in ACMEv1 or ACMEv2 mode), Pebble is used if not set.') + choices=['pebble', 'boulder-v2'], default='pebble', + help='type of CA server to start: can be Pebble or Boulder. ' + 'Pebble is used if not set.') parser.add_argument('--dns-server', '-d', help='specify the DNS server as `IP:PORT` to use by ' 'Pebble; if not specified, a local mock DNS server will be used to ' diff --git a/certbot-ci/certbot_integration_tests/utils/constants.py b/certbot-ci/certbot_integration_tests/utils/constants.py index b02c434db..dd41d670e 100644 --- a/certbot-ci/certbot_integration_tests/utils/constants.py +++ b/certbot-ci/certbot_integration_tests/utils/constants.py @@ -2,7 +2,6 @@ DEFAULT_HTTP_01_PORT = 5002 TLS_ALPN_01_PORT = 5001 CHALLTESTSRV_PORT = 8055 -BOULDER_V1_DIRECTORY_URL = 'http://localhost:4000/directory' BOULDER_V2_DIRECTORY_URL = 'http://localhost:4001/directory' PEBBLE_DIRECTORY_URL = 'https://localhost:14000/dir' PEBBLE_MANAGEMENT_URL = 'https://localhost:15000' |