From eb475e23f74d30f470e841ddf0a65f031081cad5 Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Fri, 10 Jan 2025 17:09:48 -0800 Subject: [PATCH] ansible-test - Update utility containers (#84545) --- changelogs/fragments/ansible-test-containers.yml | 3 +++ .../_internal/commands/integration/cloud/httptester.py | 2 +- test/lib/ansible_test/_internal/docker_util.py | 2 +- test/lib/ansible_test/_internal/pypi_proxy.py | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/changelogs/fragments/ansible-test-containers.yml b/changelogs/fragments/ansible-test-containers.yml index 557b05cb20c..01173887b71 100644 --- a/changelogs/fragments/ansible-test-containers.yml +++ b/changelogs/fragments/ansible-test-containers.yml @@ -2,3 +2,6 @@ minor_changes: - ansible-test - Replace container Fedora 40 with 41. - ansible-test - Replace container Alpine 3.20 with 3.21. - ansible-test - Update distro containers to remove unnecessary pakages (apache2, subversion, ruby). + - ansible-test - Update the HTTP test container. + - ansible-test - Update the PyPI test container. + - ansible-test - Update the utility container. diff --git a/test/lib/ansible_test/_internal/commands/integration/cloud/httptester.py b/test/lib/ansible_test/_internal/commands/integration/cloud/httptester.py index 886972eb083..9d987d23efa 100644 --- a/test/lib/ansible_test/_internal/commands/integration/cloud/httptester.py +++ b/test/lib/ansible_test/_internal/commands/integration/cloud/httptester.py @@ -31,7 +31,7 @@ class HttptesterProvider(CloudProvider): def __init__(self, args: IntegrationConfig) -> None: super().__init__(args) - self.image = os.environ.get('ANSIBLE_HTTP_TEST_CONTAINER', 'quay.io/ansible/http-test-container:3.2.0') + self.image = os.environ.get('ANSIBLE_HTTP_TEST_CONTAINER', 'quay.io/ansible/http-test-container:3.3.0') self.uses_docker = True diff --git a/test/lib/ansible_test/_internal/docker_util.py b/test/lib/ansible_test/_internal/docker_util.py index 0fd22fbcec1..7632ef51e4d 100644 --- a/test/lib/ansible_test/_internal/docker_util.py +++ b/test/lib/ansible_test/_internal/docker_util.py @@ -49,7 +49,7 @@ DOCKER_COMMANDS = [ 'podman', ] -UTILITY_IMAGE = 'quay.io/ansible/ansible-test-utility-container:3.1.0' +UTILITY_IMAGE = 'quay.io/ansible/ansible-test-utility-container:3.2.0' # Max number of open files in a docker container. # Passed with --ulimit option to the docker run command. diff --git a/test/lib/ansible_test/_internal/pypi_proxy.py b/test/lib/ansible_test/_internal/pypi_proxy.py index ad7413fbdba..62f2a3da764 100644 --- a/test/lib/ansible_test/_internal/pypi_proxy.py +++ b/test/lib/ansible_test/_internal/pypi_proxy.py @@ -69,7 +69,7 @@ def run_pypi_proxy(args: EnvironmentConfig, targets_use_pypi: bool) -> None: display.warning('Unable to use the PyPI proxy because Docker is not available. Installation of packages using `pip` may fail.') return - image = 'quay.io/ansible/pypi-test-container:3.2.0' + image = 'quay.io/ansible/pypi-test-container:3.3.0' port = 3141 run_support_container(