From 405da50dc724a73e04df5ec1bc76c13c337e2b93 Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Mon, 26 Apr 2021 13:27:06 -0700 Subject: [PATCH] [stable-2.11] Fix pypi-test-container port conflict. (cherry picked from commit cb7f4f19717e91930f695fe0be5adc6cacf5162f) Co-authored-by: Matt Clay --- .../fragments/ansible-test-pypi-container-no-publish.yml | 3 +++ test/lib/ansible_test/_internal/executor.py | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 changelogs/fragments/ansible-test-pypi-container-no-publish.yml diff --git a/changelogs/fragments/ansible-test-pypi-container-no-publish.yml b/changelogs/fragments/ansible-test-pypi-container-no-publish.yml new file mode 100644 index 00000000000..7b753ea93c5 --- /dev/null +++ b/changelogs/fragments/ansible-test-pypi-container-no-publish.yml @@ -0,0 +1,3 @@ +bugfixes: + - ansible-test - Avoid publishing the port used by the ``pypi-test-container`` since it is only accessed by other containers. + This avoids issues when trying to run tests in parallel on a single host. diff --git a/test/lib/ansible_test/_internal/executor.py b/test/lib/ansible_test/_internal/executor.py index c3755a7113a..5500c1cce05 100644 --- a/test/lib/ansible_test/_internal/executor.py +++ b/test/lib/ansible_test/_internal/executor.py @@ -1436,7 +1436,6 @@ def run_pypi_proxy(args): # type: (EnvironmentConfig) -> t.Tuple[t.Optional[str options = [ '--detach', - '-p', '%d:%d' % (port, port), ] docker_pull(args, proxy_image)