NBS-4818 : Use ydb as a binary in filestore tests.

ydb-platform · Jan 29, 2024 · 846f17a · 846f17a
1 parent 6b0b25d
commit 846f17a
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 2 deletions.
diff --git a/cloud/filestore/tests/recipes/service-kikimr.inc b/cloud/filestore/tests/recipes/service-kikimr.inc
@@ -2,7 +2,7 @@ DEPENDS(
     cloud/filestore/apps/server
     cloud/filestore/tests/recipes/service-kikimr
 
-    contrib/ydb/apps/ydbd
+    cloud/storage/core/tools/testing/ydb/bin
 )
 
 IF (NFS_RESTART_INTERVAL)

diff --git a/cloud/filestore/tests/recipes/service-kikimr/__main__.py b/cloud/filestore/tests/recipes/service-kikimr/__main__.py
@@ -33,7 +33,7 @@ def start(argv):
     parser.add_argument("--restart-interval", action="store", default=None)
     args = parser.parse_args(argv)
 
-    kikimr_binary_path = common.binary_path("contrib/ydb/apps/ydbd/ydbd")
+    kikimr_binary_path = common.binary_path("cloud/storage/core/tools/testing/ydb/bin/ydbd")
     if args.kikimr_package_path is not None:
         kikimr_binary_path = common.build_path("{}/Berkanavt/kikimr/bin/kikimr".format(args.kikimr_package_path))
 

diff --git a/cloud/storage/core/tools/testing/ya.make b/cloud/storage/core/tools/testing/ya.make
@@ -6,4 +6,5 @@ RECURSE(
     threadpool-test
     unstable-process
     virtiofs_server
+    ydb
 )
diff --git a/cloud/storage/core/tools/testing/ydb/bin/ya.make b/cloud/storage/core/tools/testing/ydb/bin/ya.make
@@ -0,0 +1,10 @@
+PACKAGE()
+
+FROM_SANDBOX(
+    5734000725
+    AUTOUPDATED ydbd
+    EXECUTABLE
+    OUT ydbd
+)
+
+END()
diff --git a/cloud/storage/core/tools/testing/ydb/ya.make b/cloud/storage/core/tools/testing/ydb/ya.make
@@ -0,0 +1,3 @@
+RECURSE(
+    bin
+)