Skip to content

Commit 9d9fb06

Browse files
antonmyagkovantonmyagkov
committed
tests: use prebuilt ydbd
1 parent 3d34af0 commit 9d9fb06

File tree

53 files changed

+90
-93
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+90
-93
lines changed

‎cloud/blockstore/tests/client/test_with_multiple_agents.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,7 @@ def __init__(
7878
self.agent_count = agent_count
7979
self.__disk_agents = []
8080

81-
self.kikimr_binary_path = yatest_common.binary_path(
82-
"contrib/ydb/apps/ydbd/ydbd")
81+
self.kikimr_binary_path = yatest_common.binary_path(os.getenv("YDBD_BINARY"))
8382
self.nbs_binary_path = yatest_common.binary_path(
8483
"cloud/blockstore/apps/server/nbsd")
8584
self.disk_agent_binary_path = yatest_common.binary_path(

‎cloud/blockstore/tests/client/ya.make‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ DEPENDS(
1212
cloud/blockstore/apps/client
1313
cloud/blockstore/apps/disk_agent
1414
cloud/blockstore/apps/server
15-
16-
contrib/ydb/apps/ydbd
1715
)
1816

1917
DATA(
@@ -28,4 +26,6 @@ PEERDIR(
2826
contrib/ydb/tests/library
2927
)
3028

29+
INCLUDE(${ARCADIA_ROOT}/cloud/storage/core/tests/recipes/ydbd.inc)
30+
3131
END()

‎cloud/blockstore/tests/config_dispatcher/ya.make‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@ DEPENDS(
1919
cloud/blockstore/apps/client
2020
cloud/blockstore/apps/server
2121
cloud/blockstore/apps/disk_agent
22-
contrib/ydb/apps/ydbd
2322
)
2423

2524
DATA(
2625
arcadia/cloud/blockstore/tests/certs/server.crt
2726
arcadia/cloud/blockstore/tests/certs/server.key
2827
)
2928

29+
INCLUDE(${ARCADIA_ROOT}/cloud/storage/core/tests/recipes/ydbd.inc)
30+
3031
END()

‎cloud/blockstore/tests/csi_driver/csi_sanity_tests/ya.make‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ DEPENDS(
1515
cloud/blockstore/apps/client
1616
cloud/blockstore/apps/disk_agent
1717
cloud/blockstore/apps/server
18-
contrib/ydb/apps/ydbd
1918
)
2019

2120
PEERDIR(
@@ -31,5 +30,6 @@ SET_APPEND(QEMU_VIRTIO none)
3130
SET_APPEND(QEMU_ENABLE_KVM True)
3231
SET_APPEND(QEMU_MEM 8G)
3332
INCLUDE(${ARCADIA_ROOT}/cloud/storage/core/tests/recipes/qemu.inc)
33+
INCLUDE(${ARCADIA_ROOT}/cloud/storage/core/tests/recipes/ydbd.inc)
3434

3535
END()

‎cloud/blockstore/tests/csi_driver/e2e_tests_nfs/ya.make‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ DEPENDS(
2222
cloud/blockstore/apps/server
2323
cloud/filestore/apps/client
2424
cloud/filestore/apps/vhost
25-
contrib/ydb/apps/ydbd
2625
)
2726

2827
PEERDIR(
@@ -38,5 +37,6 @@ SET_APPEND(QEMU_VIRTIO none)
3837
SET_APPEND(QEMU_ENABLE_KVM True)
3938
SET_APPEND(QEMU_MEM 8G)
4039
INCLUDE(${ARCADIA_ROOT}/cloud/storage/core/tests/recipes/qemu.inc)
40+
INCLUDE(${ARCADIA_ROOT}/cloud/storage/core/tests/recipes/ydbd.inc)
4141

4242
END()

‎cloud/blockstore/tests/csi_driver/e2e_tests_part1/ya.make‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ DEPENDS(
2020
cloud/blockstore/apps/client
2121
cloud/blockstore/apps/disk_agent
2222
cloud/blockstore/apps/server
23-
contrib/ydb/apps/ydbd
2423
)
2524

2625
PEERDIR(
@@ -36,5 +35,6 @@ SET_APPEND(QEMU_VIRTIO none)
3635
SET_APPEND(QEMU_ENABLE_KVM True)
3736
SET_APPEND(QEMU_MEM 8G)
3837
INCLUDE(${ARCADIA_ROOT}/cloud/storage/core/tests/recipes/qemu.inc)
38+
INCLUDE(${ARCADIA_ROOT}/cloud/storage/core/tests/recipes/ydbd.inc)
3939

4040
END()

‎cloud/blockstore/tests/csi_driver/e2e_tests_part2/ya.make‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ DEPENDS(
2020
cloud/blockstore/apps/client
2121
cloud/blockstore/apps/disk_agent
2222
cloud/blockstore/apps/server
23-
contrib/ydb/apps/ydbd
2423
)
2524

2625
PEERDIR(
@@ -36,5 +35,6 @@ SET_APPEND(QEMU_VIRTIO none)
3635
SET_APPEND(QEMU_ENABLE_KVM True)
3736
SET_APPEND(QEMU_MEM 8G)
3837
INCLUDE(${ARCADIA_ROOT}/cloud/storage/core/tests/recipes/qemu.inc)
38+
INCLUDE(${ARCADIA_ROOT}/cloud/storage/core/tests/recipes/ydbd.inc)
3939

4040
END()

‎cloud/blockstore/tests/direct_device_acquire/ya.make‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@ DEPENDS(
1010
cloud/blockstore/apps/server
1111
cloud/blockstore/tools/testing/fake-vhost-server
1212
cloud/blockstore/vhost-server
13-
contrib/ydb/apps/ydbd
1413
)
1514

1615
PEERDIR(
1716
cloud/blockstore/tests/python/lib
1817
)
1918

19+
INCLUDE(${ARCADIA_ROOT}/cloud/storage/core/tests/recipes/ydbd.inc)
20+
2021
END()

‎cloud/blockstore/tests/disk_agent_config/ya.make‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@ DEPENDS(
88
cloud/blockstore/apps/client
99
cloud/blockstore/apps/disk_agent
1010
cloud/blockstore/apps/server
11-
contrib/ydb/apps/ydbd
1211
)
1312

1413
PEERDIR(
1514
cloud/blockstore/tests/python/lib
1615
)
1716

17+
INCLUDE(${ARCADIA_ROOT}/cloud/storage/core/tests/recipes/ydbd.inc)
18+
1819
END()

‎cloud/blockstore/tests/disk_states/ya.make‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@ DEPENDS(
88
cloud/blockstore/apps/client
99
cloud/blockstore/apps/disk_agent
1010
cloud/blockstore/apps/server
11-
contrib/ydb/apps/ydbd
1211
)
1312

1413
PEERDIR(
1514
cloud/blockstore/tests/python/lib
1615
)
1716

17+
INCLUDE(${ARCADIA_ROOT}/cloud/storage/core/tests/recipes/ydbd.inc)
18+
1819
END()

0 commit comments

Comments
 (0)