Skip to content

Commit 10071e0

Browse files
authored
Stable-25-1-2: Customisation for ydbd path in e2e tests (#19920)
2 parents 356c61b + ca997fc commit 10071e0

File tree

56 files changed

+75
-117
lines changed

Some content is hidden

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

56 files changed

+75
-117
lines changed

ydb/core/kqp/tests/kikimr_tpch/ya.make

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@ UNITTEST()
22

33
ENV(YDB_HARD_MEMORY_LIMIT_BYTES="107374182400")
44
INCLUDE(${ARCADIA_ROOT}/ydb/public/tools/ydb_recipe/recipe.inc)
5-
ENV(YDB_DRIVER_BINARY="ydb/apps/ydbd/ydbd")
5+
INCLUDE(${ARCADIA_ROOT}/ydb/tests/ydbd_dep.inc)
66

77
DEPENDS(
8-
ydb/apps/ydbd
98
ydb/public/tools/ydb_recipe
109
ydb/library/yql/udfs/common/datetime
1110
yql/essentials/udfs/common/datetime2

ydb/core/viewer/tests/ya.make

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
PY3TEST()
2-
ENV(YDB_DRIVER_BINARY="ydb/apps/ydbd/ydbd")
2+
INCLUDE(${ARCADIA_ROOT}/ydb/tests/ydbd_dep.inc)
33

44
TEST_SRCS(test.py)
55

66
SIZE(MEDIUM)
77
DEPENDS(
8-
ydb/apps/ydbd
98
)
109

1110
PEERDIR(

ydb/tests/acceptance/ya.make

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Various tests which we can't run in every pull request (because of instability/specific environment/execution time/etc)
22

33
PY3TEST()
4-
ENV(YDB_DRIVER_BINARY="ydb/apps/ydbd/ydbd")
4+
INCLUDE(${ARCADIA_ROOT}/ydb/tests/ydbd_dep.inc)
55
ENV(YDB_CLUSTER_YAML="ydb/tests/acceptance/cluster.yaml")
66

77
TEST_SRCS(
@@ -13,7 +13,6 @@ SIZE(LARGE)
1313

1414
DEPENDS(
1515
ydb/tests/tools/ydb_serializable
16-
ydb/apps/ydbd
1716
)
1817

1918
PEERDIR(

ydb/tests/example/ya.make

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
PY3TEST()
2-
ENV(YDB_DRIVER_BINARY="ydb/apps/ydbd/ydbd")
2+
3+
INCLUDE(${ARCADIA_ROOT}/ydb/tests/ydbd_dep.inc)
34

45
TEST_SRCS(
56
test_example.py # TODO: change file name to yours
67
)
78

89
SIZE(MEDIUM)
910

10-
DEPENDS(
11-
ydb/apps/ydbd
12-
)
1311

1412
PEERDIR(
1513
ydb/tests/library

ydb/tests/functional/api/ya.make

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ PY3TEST()
33
FORK_TEST_FILES()
44
SIZE(MEDIUM)
55

6-
ENV(YDB_DRIVER_BINARY="ydb/apps/ydbd/ydbd")
6+
INCLUDE(${ARCADIA_ROOT}/ydb/tests/ydbd_dep.inc)
77
ENV(YDB_HARD_MEMORY_LIMIT_BYTES="8000000000")
88

99
TEST_SRCS(
@@ -20,7 +20,6 @@ TEST_SRCS(
2020
)
2121

2222
DEPENDS(
23-
ydb/apps/ydbd
2423
)
2524

2625
PEERDIR(

ydb/tests/functional/audit/ya.make

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,14 @@ SPLIT_FACTOR(100)
1010
SIZE(MEDIUM)
1111

1212
ENV(YDB_USE_IN_MEMORY_PDISKS=true)
13-
ENV(YDB_DRIVER_BINARY="ydb/apps/ydbd/ydbd")
13+
INCLUDE(${ARCADIA_ROOT}/ydb/tests/ydbd_dep.inc)
1414

1515
TEST_SRCS(
1616
conftest.py
1717
test_auditlog.py
1818
)
1919

2020
DEPENDS(
21-
ydb/apps/ydbd
2221
)
2322

2423
PEERDIR(

ydb/tests/functional/autoconfig/ya.make

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
PY3TEST()
22

3-
ENV(YDB_DRIVER_BINARY="ydb/apps/ydbd/ydbd")
3+
INCLUDE(${ARCADIA_ROOT}/ydb/tests/ydbd_dep.inc)
44
TEST_SRCS(
55
test_actorsystem.py
66
)
@@ -16,7 +16,6 @@ ENDIF()
1616
SPLIT_FACTOR(20)
1717

1818
DEPENDS(
19-
ydb/apps/ydbd
2019
)
2120

2221
PEERDIR(

ydb/tests/functional/blobstorage/ya.make

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
PY3TEST()
22

3-
ENV(YDB_DRIVER_BINARY="ydb/apps/ydbd/ydbd")
3+
INCLUDE(${ARCADIA_ROOT}/ydb/tests/ydbd_dep.inc)
44
TEST_SRCS(
55
test_pdisk_format_info.py
66
test_replication.py
@@ -22,7 +22,6 @@ ENDIF()
2222
SPLIT_FACTOR(20)
2323

2424
DEPENDS(
25-
ydb/apps/ydbd
2625
)
2726

2827
PEERDIR(

ydb/tests/functional/canonical/ya.make

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@ ELSE()
1212
SIZE(MEDIUM)
1313
ENDIF()
1414

15-
ENV(YDB_DRIVER_BINARY="ydb/apps/ydbd/ydbd")
15+
INCLUDE(${ARCADIA_ROOT}/ydb/tests/ydbd_dep.inc)
1616
DEPENDS(
17-
ydb/apps/ydbd
1817
)
1918

2019

ydb/tests/functional/cms/ya.make

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,8 @@ ELSE()
2323
ENDIF()
2424

2525

26-
ENV(YDB_DRIVER_BINARY="ydb/apps/ydbd/ydbd")
26+
INCLUDE(${ARCADIA_ROOT}/ydb/tests/ydbd_dep.inc)
2727
DEPENDS(
28-
ydb/apps/ydbd
2928
)
3029

3130
PEERDIR(

0 commit comments

Comments
 (0)