Merge pull request #89919 from ClickHouse/revert-89207-fix_ytsaurus_intg_tests_ports_v2

Algunenano · web-flow · commit d0dec34db7e6 · 2025-11-12T15:23:10.000Z
Revert "Fix ports conflicts for ytsaurus integration tests v2 "
diff --git a/tests/integration/compose/docker_compose_ytsaurus.yml b/tests/integration/compose/docker_compose_ytsaurus.yml
@@ -10,16 +10,4 @@ services:
             YT_PROXY: ytsaurus_backend1:${YTSAURUS_PROXY_PORT}
         ports:
             - ${YTSAURUS_PROXY_PORT}:${YTSAURUS_PROXY_PORT}
-        entrypoint: yt_local start --proxy-port ${YTSAURUS_PROXY_PORT}
-                    --local-cypress-dir /var/lib/yt/local-cypress
-                    --ytserver-all-path /usr/bin/ytserver-all
-                    --sync --fqdn ytsaurus_backend1
-                    --proxy-config '{coordinator={public_fqdn="ytsaurus_backend1:${YTSAURUS_PROXY_PORT}"}}'
-                    --node-count 1
-                    --queue-agent-count 1
-                    --address-resolver-config '{enable_ipv4=%true;enable_ipv6=%false;}'
-                    --listen-port-pool ${YTSAURUS_INTERNAL_PORTS_LIST}
-                    --native-client-supported
-                    --id primary -c '{name=query-tracker}'
-                    --enable-auth
-                    --create-admin-user
+        entrypoint: yt_local start --proxy-port ${YTSAURUS_PROXY_PORT} --local-cypress-dir /var/lib/yt/local-cypress --ytserver-all-path /usr/bin/ytserver-all --sync --fqdn ytsaurus_backend1 --proxy-config '{coordinator={public_fqdn="ytsaurus_backend1:${YTSAURUS_PROXY_PORT}"}}' --node-count 1 --queue-agent-count 1 --address-resolver-config '{enable_ipv4=%true;enable_ipv6=%false;}' --port-range-start 50000 --native-client-supported --id primary -c '{name=query-tracker}'  --enable-auth --create-admin-user
diff --git a/tests/integration/helpers/cluster.py b/tests/integration/helpers/cluster.py
@@ -865,8 +865,6 @@ def __init__(
         self.prometheus_remote_read_handlers = []
 
         self._ytsaurus_port = None
-        self._ytsaurus_internal_ports_list = None
-        self.ytsaurus_internal_ports_list_size = 20
 
         self.docker_client: docker.DockerClient = None
         self.is_up = False
@@ -987,14 +985,6 @@ def ytsaurus_port(self):
             self._ytsaurus_port = self.port_pool.get_port()
         return self._ytsaurus_port
 
-    @property
-    def ytsaurus_internal_ports_list(self):
-        if not self._ytsaurus_internal_ports_list:
-            self._ytsaurus_internal_ports_list = []
-            for _ in range(self.ytsaurus_internal_ports_list_size):
-                self._ytsaurus_internal_ports_list.append(self.port_pool.get_port())
-        return self._ytsaurus_internal_ports_list
-
     def print_all_docker_pieces(self):
         res_networks = subprocess.check_output(
             f"docker network ls --filter name='{self.project_name}*'",
@@ -1763,9 +1753,6 @@ def setup_hive(self, instance, env_variables, docker_compose_yml_dir):
     def setup_ytsaurus(self, instance, env_variables, docker_compose_yml_dir):
         self.with_ytsaurus = True
         env_variables["YTSAURUS_PROXY_PORT"] = str(self.ytsaurus_port)
-        env_variables["YTSAURUS_INTERNAL_PORTS_LIST"] = " ".join(
-            str(port) for port in self.ytsaurus_internal_ports_list
-        )
 
         self.base_cmd.extend(
             ["--file", p.join(docker_compose_yml_dir, "docker_compose_ytsaurus.yml")]
