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

ydb-platform · Jan 29, 2024 · 6dd4220 · 6dd4220
1 parent 9c51f27
commit 6dd4220
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 3 deletions.
diff --git a/build/ext_mapping.conf.json b/build/ext_mapping.conf.json
@@ -15,7 +15,8 @@
         "5274078903": "https://storage.ai.nebius.cloud/nbs-oss-resources/panic.img",
         "4709742882": "https://storage.ai.nebius.cloud/nbs-oss-resources/ubuntu-22.04-jammy-server-cloudimg-amd64.vmdk",
         "4915490540": "https://storage.ai.nebius.cloud/nbs-oss-resources/root.squashfs",
-        "1268336763": "https://storage.ai.nebius.cloud/nbs-oss-resources/1268336763.rootfs.squashfs"
+        "1268336763": "https://storage.ai.nebius.cloud/nbs-oss-resources/1268336763.rootfs.squashfs",
+        "5734000725": "https://storage.ai.nebius.cloud/nbs-oss-resources/ydbd.tar.gz"
     },
     "resources_descriptions": {
         "4081472014": "cloud/blockstore/tests/loadtest/selftest",
@@ -26,6 +27,7 @@
         "4449551218": "cloud/storage/core/tools/testing/qemu/bin",
         "3307630510": "cloud/storage/core/tools/testing/qemu/image",
         "4556399018": "cloud/storage/core/tools/testing/virtiofs_server/bin",
+        "5734000725": "cloud/storage/core/tools/testing/ydb/bin",
         "2513045473": "cloud/filestore/tools/testing/fs_posix_compliance/suite/bin",
         "2951476475": "cloud/disk_manager/internal/pkg/dataplane/url/qcow2/tests|cloud/disk_manager/internal/pkg/facade/image_service_test|cloud/disk_manager/internal/pkg/facade/image_service_nemesis_test",
         "3064742393": "cloud/disk_manager/internal/pkg/dataplane/url/qcow2/tests",

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
+)