Explicit ydb/tools/cfg/bin/ydb_configure path (#12213)

Author: maximyurchuk

ydb/tests/library/harness/kikimr_cluster.py

@@ -33,6 +33,7 @@ class ExternalKiKiMRCluster(KiKiMRClusterInterface):
     def __init__(
             self,
             config_path,
+            kikimr_configure_binary_path,
             kikimr_path,
             kikimr_next_path=None,
             ssh_username=None,
@@ -41,6 +42,7 @@ def __init__(
         self.__config_path = config_path
         with open(config_path, 'r') as r:
             self.__yaml_config = yaml.safe_load(r.read())
+        self.__kikimr_configure_binary_path = kikimr_configure_binary_path
         self.__hosts = [host['name'] for host in self.__yaml_config.get('hosts')]
         self._slots = None
         self.__kikimr_path = kikimr_path
@@ -188,6 +190,7 @@ def _prepare_cluster(self):
     def nodes(self):
         return {
             node_id: KikimrExternalNode(
+                kikimr_configure_binary_path=self.__kikimr_configure_binary_path,
                 kikimr_path=self.__kikimr_path,
                 kikimr_next_path=self.__kikimr_next_path,
                 node_id=node_id,
@@ -218,6 +221,7 @@ def slots(self):
                     ic_port = start + 3
 
                     self._slots[slot_idx] = KikimrExternalNode(
+                        kikimr_configure_binary_path=self.__kikimr_configure_binary_path,
                         kikimr_path=self.__kikimr_path,
                         kikimr_next_path=self.__kikimr_next_path,
                         node_id=node_id,

ydb/tests/library/harness/kikimr_runner.py

@@ -12,7 +12,6 @@
 
 from ydb.tests.library.common.wait_for import wait_for
 from . import daemon
-from . import param_constants
 from . import kikimr_config
 from . import kikimr_node_interface
 from . import kikimr_cluster_interface
@@ -571,6 +570,7 @@ class KikimrExternalNode(daemon.ExternalNodeDaemon, kikimr_node_interface.NodeIn
 
     def __init__(
             self,
+            kikimr_configure_binary_path,
             kikimr_path,
             kikimr_next_path,
             node_id,
@@ -600,6 +600,7 @@ def __init__(
 
         self._can_update = None
         self.current_version_idx = 0
+        self.__kikimr_configure_binary_path = kikimr_configure_binary_path
         self.versions = [
             self.kikimr_binary_deploy_path + "_last",
             self.kikimr_binary_deploy_path + "_next",
@@ -733,7 +734,7 @@ def switch_version(self):
 
     def prepare_artifacts(self, cluster_yml):
         self.copy_file_or_dir(
-            param_constants.kikimr_configure_binary_path(), self.kikimr_configure_binary_deploy_path)
+            self.__kikimr_configure_binary_path, self.kikimr_configure_binary_deploy_path)
 
         for version, local_driver in zip(self.versions, self.local_drivers_path):
             self.ssh_command("sudo rm -rf %s" % version)

ydb/tests/library/harness/param_constants.py

@@ -8,7 +8,3 @@ def kikimr_driver_path():
         return yatest.common.binary_path(os.getenv("YDB_DRIVER_BINARY"))
 
     return yatest.common.binary_path("kikimr/driver/kikimr")
-
-
-def kikimr_configure_binary_path():
-    return yatest.common.binary_path("ydb/tools/cfg/bin/ydb_configure")

ydb/tests/library/harness/ydbd_slice.py

@@ -107,6 +107,7 @@ def nodes(self):
         # TODO: use from config?
         return {
             node_id: KikimrExternalNode(
+                kikimr_configure_binary_path=self.__kikimr_configure_binary_path,
                 kikimr_path=self.__kikimr_path,
                 kikimr_next_path=None,
                 node_id=node_id,

ydb/tests/stability/ydb/test_stability.py

@@ -36,6 +36,10 @@ def get_slice_name():
     return yatest.common.get_param("kikimr.ci.cluster_name", None)
 
 
+def get_configure_binary_path():
+    return yatest.common.binary_path("ydb/tools/cfg/bin/ydb_configure")
+
+
 def next_version_kikimr_driver_path():
     return yatest.common.get_param("kikimr.ci.kikimr_driver_next", None)
 
@@ -64,6 +68,7 @@ def setup_class(cls):
 
         logger.info('setup_class started for slice = {}'.format(cls.slice_name))
         cls.kikimr_cluster = ExternalKiKiMRCluster(
+            kikimr_configure_binary_path=get_configure_binary_path(),
             config_path=get_slice_directory(),
             kikimr_path=kikimr_driver_path(),
             kikimr_next_path=next_version_kikimr_driver_path(),
@@ -187,6 +192,7 @@ def test_liveness_and_safety(self):
         logger.info('slice = {}'.format(slice_name))
         assert slice_name is not None
         kikimr_cluster = ExternalKiKiMRCluster(
+            kikimr_configure_binary_path=get_configure_binary_path(),
             config_path=get_slice_directory(),
             kikimr_path=kikimr_driver_path(),
             kikimr_next_path=next_version_kikimr_driver_path(),

ydb/tests/tools/nemesis/driver/__main__.py

@@ -131,6 +131,7 @@ def nemesis_logic(arguments):
     nemesis = catalog.nemesis_factory(
         ExternalKiKiMRCluster(
             arguments.ydb_cluster_template,
+            kikimr_configure_binary_path=None,
             kikimr_path=arguments.ydb_binary_path,
             ssh_username=ssh_username,
         ),