Skip to content

Commit

Permalink
NBS-4818 : Use ydb as a binary in filestore tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
Vladislav Serikov committed Jan 30, 2024
1 parent 377f72b commit 0e732a0
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 4 deletions.
20 changes: 18 additions & 2 deletions build/ext_mapping.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,15 @@
"2326530962": "https://storage.nemax.nebius.cloud/nbs-oss-resources/fio-static.tgz",
"4449551218": "https://storage.nemax.nebius.cloud/nbs-oss-resources/qemu-static.tgz",
"3307630510": "https://storage.nemax.nebius.cloud/nbs-oss-resources/rootfs.img",
"4556399018": "https://storage.nemax.nebius.cloud/nbs-oss-resources/virtiofs-server"
"4556399018": "https://storage.nemax.nebius.cloud/nbs-oss-resources/virtiofs-server",
"2513045473": "https://storage.nemax.nebius.cloud/nbs-oss-resources/flock",
"2951476475": "https://storage.ai.nebius.cloud/nbs-oss-resources/ubuntu-18.04-minimal-cloudimg-amd64.img",
"3064742393": "https://storage.ai.nebius.cloud/nbs-oss-resources/ubuntu1604-ci-stable",
"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",
"5734000725": "https://storage.ai.nebius.cloud/nbs-oss-resources/ydbd.tar.gz"
},
"resources_descriptions": {
"4081472014": "cloud/blockstore/tests/loadtest/selftest",
Expand All @@ -18,7 +26,15 @@
"2326530962": "cloud/storage/core/tools/testing/fio/bin",
"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"
"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",
"5274078903": "cloud/disk_manager/internal/pkg/dataplane/url/tests|cloud/disk_manager/internal/pkg/facade/image_service_test|cloud/disk_manager/internal/pkg/facade/image_service_nemesis_test",
"4709742882": "cloud/disk_manager/internal/pkg/dataplane/url/tests|cloud/disk_manager/internal/pkg/dataplane/url/vmdk/tests",
"4915490540": "cloud/disk_manager/internal/pkg/facade/image_service_test|cloud/disk_manager/internal/pkg/facade/image_service_nemesis_test",
"1268336763": "cloud/disk_manager/internal/pkg/logging/journald_tests"
},
"tasks": {}
}
2 changes: 1 addition & 1 deletion cloud/filestore/tests/recipes/service-kikimr.inc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ DEPENDS(
cloud/filestore/apps/server
cloud/filestore/tests/recipes/service-kikimr

ydb/apps/ydbd
cloud/storage/core/tools/testing/ydb/bin
)

IF (NFS_RESTART_INTERVAL)
Expand Down
2 changes: 1 addition & 1 deletion cloud/filestore/tests/recipes/service-kikimr/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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("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))

Expand Down
1 change: 1 addition & 0 deletions cloud/storage/core/tools/testing/ya.make
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ RECURSE(
threadpool-test
unstable-process
virtiofs_server
ydb
)
10 changes: 10 additions & 0 deletions cloud/storage/core/tools/testing/ydb/bin/ya.make
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
PACKAGE()

FROM_SANDBOX(
5734000725
AUTOUPDATED ydbd
EXECUTABLE
OUT ydbd
)

END()
3 changes: 3 additions & 0 deletions cloud/storage/core/tools/testing/ydb/ya.make
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
RECURSE(
bin
)

0 comments on commit 0e732a0

Please sign in to comment.