diff --git a/certbot-ci/certbot_integration_tests/utils/dns_server.py b/certbot-ci/certbot_integration_tests/utils/dns_server.py index 2dabf5505..6a6da1d8e 100644 --- a/certbot-ci/certbot_integration_tests/utils/dns_server.py +++ b/certbot-ci/certbot_integration_tests/utils/dns_server.py @@ -22,7 +22,7 @@ if sys.version_info >= (3, 9): # pragma: no cover else: # pragma: no cover import importlib_resources -BIND_DOCKER_IMAGE = "internetsystemsconsortium/bind9:9.16" +BIND_DOCKER_IMAGE = "internetsystemsconsortium/bind9:9.20" BIND_BIND_ADDRESS = ("127.0.0.1", 45953) # A TCP DNS message which is a query for '. CH A' transaction ID 0xcb37. This is used diff --git a/certbot-compatibility-test/certbot_compatibility_test/testdata/nginx.tar.gz b/certbot-compatibility-test/certbot_compatibility_test/testdata/nginx.tar.gz index 801ea49bb..556e04977 100644 Binary files a/certbot-compatibility-test/certbot_compatibility_test/testdata/nginx.tar.gz and b/certbot-compatibility-test/certbot_compatibility_test/testdata/nginx.tar.gz differ diff --git a/certbot-compatibility-test/nginx/nginx-roundtrip-testdata/79-configs/site-15291 b/certbot-compatibility-test/nginx/nginx-roundtrip-testdata/79-configs/site-15291 index fa09bed93..833d136cb 100644 --- a/certbot-compatibility-test/nginx/nginx-roundtrip-testdata/79-configs/site-15291 +++ b/certbot-compatibility-test/nginx/nginx-roundtrip-testdata/79-configs/site-15291 @@ -19,7 +19,6 @@ server { listen 80 default_server; - listen [::]:80 default_server ipv6only=on; root /usr/share/nginx/html; index index.html index.htm; diff --git a/letstest/letstest/multitester.py b/letstest/letstest/multitester.py index 336c6d545..7fff5efda 100644 --- a/letstest/letstest/multitester.py +++ b/letstest/letstest/multitester.py @@ -286,15 +286,15 @@ def create_client_instance(ec2_client, target, security_group_id, subnet_id, sel # 32 bit systems machine_type = 'c1.medium' name = 'le-%s'%target['name'] - print(name, end=" ") - return make_instance(ec2_client, - name, - target['ami'], - KEYNAME, - machine_type=machine_type, - security_group_id=security_group_id, - subnet_id=subnet_id, - self_destruct=self_destruct) + try: + instance = make_instance(ec2_client, name, target['ami'], KEYNAME, + machine_type=machine_type, security_group_id=security_group_id, + subnet_id=subnet_id, self_destruct=self_destruct) + except Exception: + print(f'FAIL: Unable to create instance {name}') + raise + print(f'Created instance {name}') + return instance def test_client_process(fab_config, inqueue, outqueue, log_dir): @@ -435,7 +435,6 @@ def main(): instances = [] try: - print("Creating instances: ", end="") # If we want to preserve instances, do not have them self-destruct. self_destruct = not cl_args.saveinstances for target in targetlist: @@ -444,7 +443,6 @@ def main(): security_group_id, subnet_id, self_destruct) ) - print() # Install and launch client scripts in parallel #------------------------------------------------------------------------------- diff --git a/letstest/targets/targets.yaml b/letstest/targets/targets.yaml index dbeb793f6..d3380e6a3 100644 --- a/letstest/targets/targets.yaml +++ b/letstest/targets/targets.yaml @@ -33,12 +33,7 @@ targets: #----------------------------------------------------------------------------- # CentOS # These AMI were found on https://centos.org/download/aws-images/. - - ami: ami-0aedf6b1cb669b4c7 - name: centos7 - type: centos - virt: hvm - user: centos - - ami: ami-08f2fe20b72b2ffa7 + - ami: ami-00d53d23711185071 name: centos9stream type: centos virt: hvm