From 75cf9708a05d08c3de5dffd91228444d942254b8 Mon Sep 17 00:00:00 2001 From: Vasil Dimov Date: Thu, 11 Sep 2025 15:39:14 +0200 Subject: [PATCH] ci: add one more routable address to the VMs (docker containers) Also explicitly specify which addresses from the docker network to assign to the VM. With `1.1.1.5` and `1111:1111::5` set on the machine, the tests `feature_bind_port_discover.py` and `feature_bind_port_externalip.py` will run. --- ci/test/02_run_container.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ci/test/02_run_container.py b/ci/test/02_run_container.py index abaa535553d..05887000a2b 100755 --- a/ci/test/02_run_container.py +++ b/ci/test/02_run_container.py @@ -115,6 +115,7 @@ def main(): CI_CCACHE_MOUNT = f"type=bind,src={os.environ['CCACHE_DIR']},dst={os.environ['CCACHE_DIR']}" run(["docker", "network", "create", "--ipv6", "--subnet", "1111:1111::/112", "ci-ip6net"], check=False) + run(["docker", "network", "create", "--subnet", "1.1.1.0/24", "ci-ip4net"], check=False) if os.getenv("RESTART_CI_DOCKER_BEFORE_RUN"): print("Restart docker before run to stop and clear all containers started with --rm") @@ -144,6 +145,7 @@ def main(): f"--env-file={env_file}", f"--name={os.environ['CONTAINER_NAME']}", "--network=ci-ip6net", + "--ip6=1111:1111::5", # Used by some of the tests, don't change it just here (keep them in sync). f"--platform={os.environ['CI_IMAGE_PLATFORM']}", os.environ["CONTAINER_NAME"], ] @@ -154,6 +156,8 @@ def main(): text=True, ).stdout.strip() + run(["docker", "network", "connect", "--ip=1.1.1.5", "ci-ip4net", container_id]) # The IP address is used by some of the tests, don't change it just here (keep them in sync). + def ci_exec(cmd_inner, **kwargs): if os.getenv("DANGER_RUN_CI_ON_HOST"): prefix = []