tests: use prebuilt ydbd

antonmyagkov · antonmyagkov · commit 600753864594 · 2025-12-04T12:51:22.000+01:00
diff --git a/build/conf/opensource.conf b/build/conf/opensource.conf
@@ -2,6 +2,7 @@ EXPORT_CMAKE=no
 EXPORT_GRADLE=no
 FORCE_STATIC_LINKING=no
 BUILD_CSI_DRIVER=yes
+USE_PREBUILT_YDBD=yes
 
 when ($OPENSOURCE == "yes" || $OPENSOURCE_PROJECT == "ymake" || $OPENSOURCE_PROJECT == "ya") {
     YA_OPENSOURCE=yes
diff --git a/cloud/blockstore/tests/config_dispatcher/ya.make b/cloud/blockstore/tests/config_dispatcher/ya.make
@@ -19,12 +19,13 @@ DEPENDS(
     cloud/blockstore/apps/client
     cloud/blockstore/apps/server
     cloud/blockstore/apps/disk_agent
-    contrib/ydb/apps/ydbd
 )
 
 DATA(
     arcadia/cloud/blockstore/tests/certs/server.crt
     arcadia/cloud/blockstore/tests/certs/server.key
 )
 
+INCLUDE(${ARCADIA_ROOT}/cloud/storage/core/tests/recipes/ydbd.inc)
+
 END()
diff --git a/cloud/blockstore/tests/csi_driver/csi_sanity_tests/ya.make b/cloud/blockstore/tests/csi_driver/csi_sanity_tests/ya.make
@@ -15,7 +15,6 @@ DEPENDS(
     cloud/blockstore/apps/client
     cloud/blockstore/apps/disk_agent
     cloud/blockstore/apps/server
-    contrib/ydb/apps/ydbd
 )
 
 PEERDIR(
@@ -31,5 +30,6 @@ SET_APPEND(QEMU_VIRTIO none)
 SET_APPEND(QEMU_ENABLE_KVM True)
 SET_APPEND(QEMU_MEM 8G)
 INCLUDE(${ARCADIA_ROOT}/cloud/storage/core/tests/recipes/qemu.inc)
+INCLUDE(${ARCADIA_ROOT}/cloud/storage/core/tests/recipes/ydbd.inc)
 
 END()
diff --git a/cloud/blockstore/tests/csi_driver/e2e_tests_nfs/ya.make b/cloud/blockstore/tests/csi_driver/e2e_tests_nfs/ya.make
@@ -22,7 +22,6 @@ DEPENDS(
     cloud/blockstore/apps/server
     cloud/filestore/apps/client
     cloud/filestore/apps/vhost
-    contrib/ydb/apps/ydbd
 )
 
 PEERDIR(
@@ -38,5 +37,6 @@ SET_APPEND(QEMU_VIRTIO none)
 SET_APPEND(QEMU_ENABLE_KVM True)
 SET_APPEND(QEMU_MEM 8G)
 INCLUDE(${ARCADIA_ROOT}/cloud/storage/core/tests/recipes/qemu.inc)
+INCLUDE(${ARCADIA_ROOT}/cloud/storage/core/tests/recipes/ydbd.inc)
 
 END()
diff --git a/cloud/blockstore/tests/csi_driver/e2e_tests_part1/ya.make b/cloud/blockstore/tests/csi_driver/e2e_tests_part1/ya.make
@@ -20,7 +20,6 @@ DEPENDS(
     cloud/blockstore/apps/client
     cloud/blockstore/apps/disk_agent
     cloud/blockstore/apps/server
-    contrib/ydb/apps/ydbd
 )
 
 PEERDIR(
@@ -36,5 +35,6 @@ SET_APPEND(QEMU_VIRTIO none)
 SET_APPEND(QEMU_ENABLE_KVM True)
 SET_APPEND(QEMU_MEM 8G)
 INCLUDE(${ARCADIA_ROOT}/cloud/storage/core/tests/recipes/qemu.inc)
+INCLUDE(${ARCADIA_ROOT}/cloud/storage/core/tests/recipes/ydbd.inc)
 
 END()
diff --git a/cloud/blockstore/tests/csi_driver/e2e_tests_part2/ya.make b/cloud/blockstore/tests/csi_driver/e2e_tests_part2/ya.make
@@ -20,7 +20,6 @@ DEPENDS(
     cloud/blockstore/apps/client
     cloud/blockstore/apps/disk_agent
     cloud/blockstore/apps/server
-    contrib/ydb/apps/ydbd
 )
 
 PEERDIR(
@@ -36,5 +35,6 @@ SET_APPEND(QEMU_VIRTIO none)
 SET_APPEND(QEMU_ENABLE_KVM True)
 SET_APPEND(QEMU_MEM 8G)
 INCLUDE(${ARCADIA_ROOT}/cloud/storage/core/tests/recipes/qemu.inc)
+INCLUDE(${ARCADIA_ROOT}/cloud/storage/core/tests/recipes/ydbd.inc)
 
 END()
diff --git a/cloud/blockstore/tests/direct_device_acquire/ya.make b/cloud/blockstore/tests/direct_device_acquire/ya.make
@@ -10,11 +10,12 @@ DEPENDS(
     cloud/blockstore/apps/server
     cloud/blockstore/tools/testing/fake-vhost-server
     cloud/blockstore/vhost-server
-    contrib/ydb/apps/ydbd
 )
 
 PEERDIR(
     cloud/blockstore/tests/python/lib
 )
 
+INCLUDE(${ARCADIA_ROOT}/cloud/storage/core/tests/recipes/ydbd.inc)
+
 END()
diff --git a/cloud/blockstore/tests/disk_agent_config/ya.make b/cloud/blockstore/tests/disk_agent_config/ya.make
@@ -8,11 +8,12 @@ DEPENDS(
     cloud/blockstore/apps/client
     cloud/blockstore/apps/disk_agent
     cloud/blockstore/apps/server
-    contrib/ydb/apps/ydbd
 )
 
 PEERDIR(
     cloud/blockstore/tests/python/lib
 )
 
+INCLUDE(${ARCADIA_ROOT}/cloud/storage/core/tests/recipes/ydbd.inc)
+
 END()
diff --git a/cloud/blockstore/tests/disk_states/ya.make b/cloud/blockstore/tests/disk_states/ya.make
@@ -8,11 +8,12 @@ DEPENDS(
     cloud/blockstore/apps/client
     cloud/blockstore/apps/disk_agent
     cloud/blockstore/apps/server
-    contrib/ydb/apps/ydbd
 )
 
 PEERDIR(
     cloud/blockstore/tests/python/lib
 )
 
+INCLUDE(${ARCADIA_ROOT}/cloud/storage/core/tests/recipes/ydbd.inc)
+
 END()
diff --git a/cloud/blockstore/tests/e2e-tests-vhost/ya.make b/cloud/blockstore/tests/e2e-tests-vhost/ya.make
@@ -11,7 +11,6 @@ DEPENDS(
     cloud/blockstore/apps/client
     cloud/blockstore/apps/disk_agent
     cloud/blockstore/apps/server
-    contrib/ydb/apps/ydbd
 )
 
 PEERDIR(
@@ -25,5 +24,6 @@ SET_APPEND(QEMU_INVOKE_TEST YES)
 SET_APPEND(QEMU_VIRTIO none)
 SET_APPEND(QEMU_ENABLE_KVM True)
 INCLUDE(${ARCADIA_ROOT}/cloud/storage/core/tests/recipes/qemu.inc)
+INCLUDE(${ARCADIA_ROOT}/cloud/storage/core/tests/recipes/ydbd.inc)
 
 END()
diff --git a/cloud/blockstore/tests/e2e-tests/ya.make b/cloud/blockstore/tests/e2e-tests/ya.make
@@ -16,7 +16,6 @@ DEPENDS(
     cloud/blockstore/apps/client
     cloud/blockstore/apps/disk_agent
     cloud/blockstore/apps/server
-    contrib/ydb/apps/ydbd
 )
 
 PEERDIR(
@@ -32,5 +31,6 @@ SET_APPEND(QEMU_INVOKE_TEST YES)
 SET_APPEND(QEMU_VIRTIO none)
 SET_APPEND(QEMU_ENABLE_KVM True)
 INCLUDE(${ARCADIA_ROOT}/cloud/storage/core/tests/recipes/qemu.inc)
+INCLUDE(${ARCADIA_ROOT}/cloud/storage/core/tests/recipes/ydbd.inc)
 
 END()
diff --git a/cloud/blockstore/tests/encryption_at_rest/ya.make b/cloud/blockstore/tests/encryption_at_rest/ya.make
@@ -8,13 +8,13 @@ DEPENDS(
     cloud/blockstore/apps/client
     cloud/blockstore/apps/disk_agent
     cloud/blockstore/apps/server
-    contrib/ydb/apps/ydbd
 )
 
 PEERDIR(
     cloud/blockstore/tests/python/lib
 )
 
 INCLUDE(${ARCADIA_ROOT}/cloud/blockstore/tests/recipes/fake-root-kms/recipe.inc)
+INCLUDE(${ARCADIA_ROOT}/cloud/storage/core/tests/recipes/ydbd.inc)
 
 END()
diff --git a/cloud/blockstore/tests/external_endpoint/ya.make b/cloud/blockstore/tests/external_endpoint/ya.make
@@ -13,7 +13,6 @@ DEPENDS(
     cloud/blockstore/apps/server
     cloud/blockstore/tools/testing/fake-vhost-server
     cloud/blockstore/vhost-server
-    contrib/ydb/apps/ydbd
 )
 
 PEERDIR(
@@ -24,4 +23,6 @@ PEERDIR(
     library/python/retry
 )
 
+INCLUDE(${ARCADIA_ROOT}/cloud/storage/core/tests/recipes/ydbd.inc)
+
 END()
diff --git a/cloud/blockstore/tests/infra-cms/ya.make b/cloud/blockstore/tests/infra-cms/ya.make
@@ -9,7 +9,6 @@ DEPENDS(
     cloud/blockstore/apps/server
     cloud/blockstore/tools/testing/loadtest/bin
     cloud/storage/core/tools/testing/unstable-process
-    contrib/ydb/apps/ydbd
 )
 
 DATA(
@@ -26,4 +25,6 @@ PEERDIR(
     contrib/ydb/tests/library
 )
 
+INCLUDE(${ARCADIA_ROOT}/cloud/storage/core/tests/recipes/ydbd.inc)
+
 END()
diff --git a/cloud/blockstore/tests/loadtest/ya.make.inc b/cloud/blockstore/tests/loadtest/ya.make.inc
@@ -10,7 +10,6 @@ DEPENDS(
     cloud/blockstore/tools/testing/loadtest/bin
 
     contrib/ydb/apps/ydb
-    contrib/ydb/apps/ydbd
 )
 
 PEERDIR(
@@ -20,3 +19,5 @@ PEERDIR(
     contrib/ydb/core/protos
     contrib/ydb/tests/library
 )
+
+INCLUDE(${ARCADIA_ROOT}/cloud/storage/core/tests/recipes/ydbd.inc)
diff --git a/cloud/blockstore/tests/local_ssd/ya.make b/cloud/blockstore/tests/local_ssd/ya.make
@@ -8,11 +8,12 @@ DEPENDS(
     cloud/blockstore/apps/client
     cloud/blockstore/apps/disk_agent
     cloud/blockstore/apps/server
-    contrib/ydb/apps/ydbd
 )
 
 PEERDIR(
     cloud/blockstore/tests/python/lib
 )
 
+INCLUDE(${ARCADIA_ROOT}/cloud/storage/core/tests/recipes/ydbd.inc)
+
 END()
diff --git a/cloud/blockstore/tests/monitoring/test.py b/cloud/blockstore/tests/monitoring/test.py
@@ -810,7 +810,7 @@ def __rpc(self, *args, **kwargs):
 
 
 def __run_test(test_case):
-    kikimr_binary_path = yatest_common.binary_path("contrib/ydb/apps/ydbd/ydbd")
+    kikimr_binary_path = yatest_common.binary_path(os.getenv("YDBD_BINARY"))
 
     configurator = KikimrConfigGenerator(
         erasure=None,
diff --git a/cloud/blockstore/tests/monitoring/ya.make b/cloud/blockstore/tests/monitoring/ya.make
@@ -7,7 +7,6 @@ TEST_SRCS(test.py)
 DEPENDS(
     cloud/blockstore/apps/client
     cloud/blockstore/apps/server
-    contrib/ydb/apps/ydbd
 )
 
 DATA(
@@ -23,4 +22,6 @@ PEERDIR(
     contrib/ydb/tests/library
 )
 
+INCLUDE(${ARCADIA_ROOT}/cloud/storage/core/tests/recipes/ydbd.inc)
+
 END()
diff --git a/cloud/blockstore/tests/mount/test.py b/cloud/blockstore/tests/mount/test.py
@@ -39,7 +39,7 @@ class CommonPaths:
 
     def __init__(self):
         self.kikimr_binary_path = \
-            yatest_common.binary_path("contrib/ydb/apps/ydbd/ydbd")
+            yatest_common.binary_path(os.getenv("YDBD_BINARY"))
         self.nbs_binary_path = \
             yatest_common.binary_path(
                 "cloud/blockstore/apps/server/nbsd")
diff --git a/cloud/blockstore/tests/mount/ya.make b/cloud/blockstore/tests/mount/ya.make
@@ -7,8 +7,6 @@ TEST_SRCS(test.py)
 DEPENDS(
     cloud/blockstore/apps/client
     cloud/blockstore/apps/server
-
-    contrib/ydb/apps/ydbd
 )
 
 DATA(
@@ -24,5 +22,6 @@ PEERDIR(
     contrib/ydb/tests/library
 )
 
-END()
+INCLUDE(${ARCADIA_ROOT}/cloud/storage/core/tests/recipes/ydbd.inc)
 
+END()
diff --git a/cloud/blockstore/tests/notify/test.py b/cloud/blockstore/tests/notify/test.py
@@ -245,7 +245,7 @@ def run(self, nbs, devices):
 def __run_test(test_case):
     logging.info(f"Start: {test_case.name}")
 
-    kikimr_binary_path = yatest_common.binary_path("contrib/ydb/apps/ydbd/ydbd")
+    kikimr_binary_path = yatest_common.binary_path(os.getenv("YDBD_BINARY"))
 
     configurator = KikimrConfigGenerator(
         erasure=None,
diff --git a/cloud/blockstore/tests/notify/ya.make b/cloud/blockstore/tests/notify/ya.make
@@ -9,7 +9,6 @@ DEPENDS(
     cloud/blockstore/apps/disk_agent
     cloud/blockstore/apps/server
     cloud/blockstore/tools/testing/notify-mock
-    contrib/ydb/apps/ydbd
 )
 
 DATA(
@@ -26,4 +25,6 @@ PEERDIR(
     contrib/ydb/tests/library
 )
 
+INCLUDE(${ARCADIA_ROOT}/cloud/storage/core/tests/recipes/ydbd.inc)
+
 END()
diff --git a/cloud/blockstore/tests/python/lib/daemon.py b/cloud/blockstore/tests/python/lib/daemon.py
@@ -1,4 +1,5 @@
 import json
+import os
 import requests
 import subprocess
 import socket
@@ -254,7 +255,7 @@ def __enable_custom_cms_configs(ydb):
 def start_ydb(grpc_ssl_enable=False):
     configurator = KikimrConfigGenerator(
         erasure=None,
-        binary_path=yatest_common.binary_path("contrib/ydb/apps/ydbd/ydbd"),
+        binary_path=yatest_common.binary_path(os.getenv("YDBD_BINARY")),
         use_in_memory_pdisks=True,
         grpc_ssl_enable=grpc_ssl_enable,
         dynamic_storage_pools=[
diff --git a/cloud/blockstore/tests/python/lib/loadtest_env.py b/cloud/blockstore/tests/python/lib/loadtest_env.py
@@ -58,7 +58,7 @@ def __init__(
         self.__endpoint = endpoint
 
         if kikimr_binary_path is None:
-            kikimr_binary_path = yatest_common.binary_path("contrib/ydb/apps/ydbd/ydbd")
+            kikimr_binary_path = yatest_common.binary_path(os.getenv("YDBD_BINARY"))
 
         self.configurator = KikimrConfigGenerator(
             erasure=None,
diff --git a/cloud/blockstore/tests/python/lib/nbs_runner.py b/cloud/blockstore/tests/python/lib/nbs_runner.py
@@ -244,7 +244,7 @@ def init_scheme(self):
 """
 
         if self.__kikimr_binary_path is None:
-            self.__kikimr_binary_path = yatest_common.binary_path("contrib/ydb/apps/ydbd/ydbd")
+            self.__kikimr_binary_path = yatest_common.binary_path(os.getenv("YDBD_BINARY"))
 
         command = [
             self.__kikimr_binary_path,
diff --git a/cloud/blockstore/tests/rdma_disks/ya.make b/cloud/blockstore/tests/rdma_disks/ya.make
@@ -8,7 +8,6 @@ DEPENDS(
     cloud/blockstore/apps/client
     cloud/blockstore/apps/disk_agent
     cloud/blockstore/apps/server
-    contrib/ydb/apps/ydbd
 )
 
 DATA(
@@ -20,4 +19,6 @@ PEERDIR(
     cloud/blockstore/tests/python/lib
 )
 
+INCLUDE(${ARCADIA_ROOT}/cloud/storage/core/tests/recipes/ydbd.inc)
+
 END()
diff --git a/cloud/blockstore/tests/recipes/local-kikimr/local-kikimr.inc b/cloud/blockstore/tests/recipes/local-kikimr/local-kikimr.inc
@@ -1,8 +1,6 @@
 DEPENDS(
     cloud/blockstore/apps/server
     cloud/blockstore/tests/recipes/local-kikimr
-
-    contrib/ydb/apps/ydbd
 )
 
 DATA(
@@ -13,4 +11,4 @@ DATA(
 USE_RECIPE(
     cloud/blockstore/tests/recipes/local-kikimr/local-kikimr-recipe --use-log-files
 )
-
+INCLUDE(${ARCADIA_ROOT}/cloud/storage/core/tests/recipes/ydbd.inc)
diff --git a/cloud/blockstore/tests/registration/ya.make b/cloud/blockstore/tests/registration/ya.make
@@ -20,7 +20,8 @@ DEPENDS(
     cloud/blockstore/apps/client
     cloud/blockstore/apps/server
     cloud/blockstore/apps/disk_agent
-    contrib/ydb/apps/ydbd
 )
 
+INCLUDE(${ARCADIA_ROOT}/cloud/storage/core/tests/recipes/ydbd.inc)
+
 END()
diff --git a/cloud/blockstore/tests/session_cache/ya.make b/cloud/blockstore/tests/session_cache/ya.make
@@ -8,7 +8,6 @@ DEPENDS(
     cloud/blockstore/apps/client
     cloud/blockstore/apps/disk_agent
     cloud/blockstore/apps/server
-    contrib/ydb/apps/ydbd
 )
 
 DATA(
@@ -22,4 +21,6 @@ PEERDIR(
     library/python/retry
 )
 
+INCLUDE(${ARCADIA_ROOT}/cloud/storage/core/tests/recipes/ydbd.inc)
+
 END()
diff --git a/cloud/blockstore/tests/spare_node/ya.make b/cloud/blockstore/tests/spare_node/ya.make
@@ -10,7 +10,8 @@ PEERDIR(
 
 DEPENDS(
     cloud/blockstore/apps/server
-    contrib/ydb/apps/ydbd
 )
 
+INCLUDE(${ARCADIA_ROOT}/cloud/storage/core/tests/recipes/ydbd.inc)
+
 END()
diff --git a/cloud/blockstore/tests/storage_discovery/ya.make b/cloud/blockstore/tests/storage_discovery/ya.make
diff --git a/cloud/blockstore/tests/tablets/test.py b/cloud/blockstore/tests/tablets/test.py
diff --git a/cloud/blockstore/tests/tablets/ya.make b/cloud/blockstore/tests/tablets/ya.make
diff --git a/cloud/filestore/tests/config_dispatcher/test.py b/cloud/filestore/tests/config_dispatcher/test.py
diff --git a/cloud/filestore/tests/config_dispatcher/ya.make b/cloud/filestore/tests/config_dispatcher/ya.make
diff --git a/cloud/filestore/tests/registration/test.py b/cloud/filestore/tests/registration/test.py
diff --git a/cloud/filestore/tests/registration/ya.make b/cloud/filestore/tests/registration/ya.make
diff --git a/cloud/storage/core/tests/recipes/ydbd.inc b/cloud/storage/core/tests/recipes/ydbd.inc

Original file line number	Diff line number	Diff line change
`@@ -19,12 +19,13 @@ DEPENDS(`
`19`	`19`	`cloud/blockstore/apps/client`
`20`	`20`	`cloud/blockstore/apps/server`
`21`	`21`	`cloud/blockstore/apps/disk_agent`
`22`		`- contrib/ydb/apps/ydbd`
`23`	`22`	`)`
`24`	`23`
`25`	`24`	`DATA(`
`26`	`25`	`arcadia/cloud/blockstore/tests/certs/server.crt`
`27`	`26`	`arcadia/cloud/blockstore/tests/certs/server.key`
`28`	`27`	`)`
`29`	`28`
	`29`	`+INCLUDE(${ARCADIA_ROOT}/cloud/storage/core/tests/recipes/ydbd.inc)`
	`30`	`+`
`30`	`31`	`END()`
Original file line number	Diff line number	Diff line change
`@@ -10,11 +10,12 @@ DEPENDS(`
`10`	`10`	`cloud/blockstore/apps/server`
`11`	`11`	`cloud/blockstore/tools/testing/fake-vhost-server`
`12`	`12`	`cloud/blockstore/vhost-server`
`13`		`- contrib/ydb/apps/ydbd`
`14`	`13`	`)`
`15`	`14`
`16`	`15`	`PEERDIR(`
`17`	`16`	`cloud/blockstore/tests/python/lib`
`18`	`17`	`)`
`19`	`18`
	`19`	`+INCLUDE(${ARCADIA_ROOT}/cloud/storage/core/tests/recipes/ydbd.inc)`
	`20`	`+`
`20`	`21`	`END()`
Original file line number	Diff line number	Diff line change
`@@ -8,11 +8,12 @@ DEPENDS(`
`8`	`8`	`cloud/blockstore/apps/client`
`9`	`9`	`cloud/blockstore/apps/disk_agent`
`10`	`10`	`cloud/blockstore/apps/server`
`11`		`- contrib/ydb/apps/ydbd`
`12`	`11`	`)`
`13`	`12`
`14`	`13`	`PEERDIR(`
`15`	`14`	`cloud/blockstore/tests/python/lib`
`16`	`15`	`)`
`17`	`16`
	`17`	`+INCLUDE(${ARCADIA_ROOT}/cloud/storage/core/tests/recipes/ydbd.inc)`
	`18`	`+`
`18`	`19`	`END()`