From 846f17a4a6d63ff21a7274431be2a66628b53d4b Mon Sep 17 00:00:00 2001 From: Vladislav Serikov Date: Mon, 29 Jan 2024 14:46:31 +0300 Subject: [PATCH] NBS-4818 : Use ydb as a binary in filestore tests. --- cloud/filestore/tests/recipes/service-kikimr.inc | 2 +- .../filestore/tests/recipes/service-kikimr/__main__.py | 2 +- cloud/storage/core/tools/testing/ya.make | 1 + cloud/storage/core/tools/testing/ydb/bin/ya.make | 10 ++++++++++ cloud/storage/core/tools/testing/ydb/ya.make | 3 +++ 5 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 cloud/storage/core/tools/testing/ydb/bin/ya.make create mode 100644 cloud/storage/core/tools/testing/ydb/ya.make diff --git a/cloud/filestore/tests/recipes/service-kikimr.inc b/cloud/filestore/tests/recipes/service-kikimr.inc index 85a3c5b9e28..af1689793da 100644 --- 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 index e0651c74bc8..8d3482d0404 100644 --- 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 index 2f024631b6f..270a655cc33 100644 --- 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 new file mode 100644 index 00000000000..faf88613ba9 --- /dev/null +++ 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 new file mode 100644 index 00000000000..a330c37c2ef --- /dev/null +++ b/cloud/storage/core/tools/testing/ydb/ya.make @@ -0,0 +1,3 @@ +RECURSE( + bin +)