diff options
26 files changed, 26 insertions, 51 deletions
diff --git a/ydb/tests/functional/audit/ya.make b/ydb/tests/functional/audit/ya.make index eaf649e2ee3..d7e8db5ba06 100644 --- a/ydb/tests/functional/audit/ya.make +++ b/ydb/tests/functional/audit/ya.make @@ -24,7 +24,7 @@ PEERDIR( ) IF (SANITIZER_TYPE) - REQUIREMENTS(ram:10) + REQUIREMENTS(ram:10 cpu:1) ENDIF() END() diff --git a/ydb/tests/functional/autoconfig/ya.make b/ydb/tests/functional/autoconfig/ya.make index 1bd8535b821..52c834cea28 100644 --- a/ydb/tests/functional/autoconfig/ya.make +++ b/ydb/tests/functional/autoconfig/ya.make @@ -6,7 +6,7 @@ TEST_SRCS( ) IF (SANITIZER_TYPE) - REQUIREMENTS(ram:16) + REQUIREMENTS(ram:16 cpu:1) ENDIF() TIMEOUT(600) diff --git a/ydb/tests/functional/backup/s3_path_style/ya.make b/ydb/tests/functional/backup/s3_path_style/ya.make index 65e6f514ba4..c0ad2c2130f 100644 --- a/ydb/tests/functional/backup/s3_path_style/ya.make +++ b/ydb/tests/functional/backup/s3_path_style/ya.make @@ -23,7 +23,7 @@ INCLUDE(${ARCADIA_ROOT}/ydb/tests/tools/s3_recipe/recipe.inc) SIZE(MEDIUM) IF (SANITIZER_TYPE) - REQUIREMENTS(ram:16) + REQUIREMENTS(ram:16 cpu:4) ENDIF() END() diff --git a/ydb/tests/functional/backup/ya.make b/ydb/tests/functional/backup/ya.make index ea0e816d892..7312186dfd0 100644 --- a/ydb/tests/functional/backup/ya.make +++ b/ydb/tests/functional/backup/ya.make @@ -25,7 +25,7 @@ INCLUDE(${ARCADIA_ROOT}/ydb/tests/tools/s3_recipe/recipe.inc) SIZE(MEDIUM) IF (SANITIZER_TYPE) - REQUIREMENTS(ram:16) + REQUIREMENTS(ram:16 cpu:4) ENDIF() END() diff --git a/ydb/tests/functional/blobstorage/ya.make b/ydb/tests/functional/blobstorage/ya.make index 737cf9410b7..c42223c1f36 100644 --- a/ydb/tests/functional/blobstorage/ya.make +++ b/ydb/tests/functional/blobstorage/ya.make @@ -9,13 +9,10 @@ TEST_SRCS( ) IF (SANITIZER_TYPE) - REQUIREMENTS(ram:32) + REQUIREMENTS(ram:32 cpu:4) ENDIF() IF (SANITIZER_TYPE == "thread") - REQUIREMENTS( - ram:16 - ) TIMEOUT(1800) SIZE(LARGE) TAG(ya:fat) diff --git a/ydb/tests/functional/cms/ya.make b/ydb/tests/functional/cms/ya.make index 792508f25c5..26ff9809255 100644 --- a/ydb/tests/functional/cms/ya.make +++ b/ydb/tests/functional/cms/ya.make @@ -12,7 +12,7 @@ TEST_SRCS( SPLIT_FACTOR(10) IF (SANITIZER_TYPE) - REQUIREMENTS(ram:16) + REQUIREMENTS(ram:16 cpu:4) ENDIF() IF (SANITIZER_TYPE == "thread") diff --git a/ydb/tests/functional/encryption/ya.make b/ydb/tests/functional/encryption/ya.make index 438b8b58c6b..bf6d731dd3c 100644 --- a/ydb/tests/functional/encryption/ya.make +++ b/ydb/tests/functional/encryption/ya.make @@ -19,7 +19,7 @@ PEERDIR( ) IF (SANITIZER_TYPE) - REQUIREMENTS(ram:32) + REQUIREMENTS(ram:32 cpu:4) ENDIF() END() diff --git a/ydb/tests/functional/hive/ya.make b/ydb/tests/functional/hive/ya.make index 9b4ba5062cf..5b30cf2bb88 100644 --- a/ydb/tests/functional/hive/ya.make +++ b/ydb/tests/functional/hive/ya.make @@ -8,16 +8,14 @@ TEST_SRCS( ) IF (SANITIZER_TYPE) - REQUIREMENTS(ram:16) + REQUIREMENTS(ram:16 cpu:2) ENDIF() IF (SANITIZER_TYPE == "thread") TIMEOUT(1200) SIZE(LARGE) TAG(ya:fat) - REQUIREMENTS( - ram:32 - ) + REQUIREMENTS(ram:32 cpu:2) SPLIT_FACTOR(20) ELSE() TIMEOUT(600) diff --git a/ydb/tests/functional/kqp/kqp_indexes/ya.make b/ydb/tests/functional/kqp/kqp_indexes/ya.make index 34577ca1a23..2ea2df0c7cd 100644 --- a/ydb/tests/functional/kqp/kqp_indexes/ya.make +++ b/ydb/tests/functional/kqp/kqp_indexes/ya.make @@ -19,7 +19,7 @@ INCLUDE(${ARCADIA_ROOT}/ydb/public/tools/ydb_recipe/recipe.inc) SIZE(MEDIUM) IF (SANITIZER_TYPE) - REQUIREMENTS(ram:16) + REQUIREMENTS(ram:16 cpu:4) ENDIF() END() diff --git a/ydb/tests/functional/kqp/kqp_query_session/ya.make b/ydb/tests/functional/kqp/kqp_query_session/ya.make index b09740c36ff..3bf4074de13 100644 --- a/ydb/tests/functional/kqp/kqp_query_session/ya.make +++ b/ydb/tests/functional/kqp/kqp_query_session/ya.make @@ -24,7 +24,7 @@ INCLUDE(${ARCADIA_ROOT}/ydb/public/tools/ydb_recipe/recipe.inc) SIZE(MEDIUM) IF (SANITIZER_TYPE) - REQUIREMENTS(ram:16) + REQUIREMENTS(ram:16 cpu:4) ENDIF() END() diff --git a/ydb/tests/functional/kqp/kqp_query_svc/ya.make b/ydb/tests/functional/kqp/kqp_query_svc/ya.make index 8d972e56bad..701e8a5ad7d 100644 --- a/ydb/tests/functional/kqp/kqp_query_svc/ya.make +++ b/ydb/tests/functional/kqp/kqp_query_svc/ya.make @@ -22,7 +22,7 @@ SIZE(MEDIUM) TIMEOUT(30) IF (SANITIZER_TYPE) - REQUIREMENTS(ram:16) + REQUIREMENTS(ram:16 cpu:4) ENDIF() END() diff --git a/ydb/tests/functional/limits/ya.make b/ydb/tests/functional/limits/ya.make index 9a008879755..ea1c19408cb 100644 --- a/ydb/tests/functional/limits/ya.make +++ b/ydb/tests/functional/limits/ya.make @@ -6,7 +6,7 @@ TEST_SRCS( ) IF (SANITIZER_TYPE) - REQUIREMENTS(ram:16) + REQUIREMENTS(ram:16 cpu:2) ENDIF() TIMEOUT(600) diff --git a/ydb/tests/functional/query_cache/ya.make b/ydb/tests/functional/query_cache/ya.make index 2c06ee33804..a8c391a6592 100644 --- a/ydb/tests/functional/query_cache/ya.make +++ b/ydb/tests/functional/query_cache/ya.make @@ -18,8 +18,4 @@ PEERDIR( ydb/public/sdk/python ) -IF (SANITIZER_TYPE) - REQUIREMENTS(ram:11) -ENDIF() - END() diff --git a/ydb/tests/functional/rename/ya.make b/ydb/tests/functional/rename/ya.make index 3549182728d..ca34fc11f16 100644 --- a/ydb/tests/functional/rename/ya.make +++ b/ydb/tests/functional/rename/ya.make @@ -16,7 +16,7 @@ FORK_SUBTESTS() SPLIT_FACTOR(10) IF (SANITIZER_TYPE) - REQUIREMENTS(ram:32) + REQUIREMENTS(ram:32 cpu:2) ENDIF() IF (SANITIZER_TYPE == "thread" OR WITH_VALGRIND) diff --git a/ydb/tests/functional/replication/ya.make b/ydb/tests/functional/replication/ya.make index 591b22d5801..86c0b3963b5 100644 --- a/ydb/tests/functional/replication/ya.make +++ b/ydb/tests/functional/replication/ya.make @@ -20,7 +20,7 @@ INCLUDE(${ARCADIA_ROOT}/ydb/public/tools/ydb_recipe/recipe.inc) SIZE(MEDIUM) IF (SANITIZER_TYPE) - REQUIREMENTS(ram:16) + REQUIREMENTS(ram:16 cpu:4) ENDIF() END() diff --git a/ydb/tests/functional/restarts/ya.make b/ydb/tests/functional/restarts/ya.make index f8581fb3779..e7cc6f8a99b 100644 --- a/ydb/tests/functional/restarts/ya.make +++ b/ydb/tests/functional/restarts/ya.make @@ -7,7 +7,7 @@ TEST_SRCS( SPLIT_FACTOR(10) IF (SANITIZER_TYPE) - REQUIREMENTS(ram:32) + REQUIREMENTS(ram:32 cpu:4) ENDIF() IF (SANITIZER_TYPE == "thread") diff --git a/ydb/tests/functional/sdk/cpp/sdk_credprovider/ya.make b/ydb/tests/functional/sdk/cpp/sdk_credprovider/ya.make index 0a62103ceb9..2a52ee3c1fa 100644 --- a/ydb/tests/functional/sdk/cpp/sdk_credprovider/ya.make +++ b/ydb/tests/functional/sdk/cpp/sdk_credprovider/ya.make @@ -15,8 +15,4 @@ INCLUDE(${ARCADIA_ROOT}/ydb/public/tools/ydb_recipe/recipe.inc) SIZE(MEDIUM) -IF (SANITIZER_TYPE) - REQUIREMENTS(ram:16) -ENDIF() - END() diff --git a/ydb/tests/functional/serverless/ya.make b/ydb/tests/functional/serverless/ya.make index 5d787beeb8c..07764285283 100644 --- a/ydb/tests/functional/serverless/ya.make +++ b/ydb/tests/functional/serverless/ya.make @@ -10,7 +10,7 @@ FORK_SUBTESTS() TIMEOUT(600) IF (SANITIZER_TYPE) - REQUIREMENTS(ram:32) + REQUIREMENTS(ram:32 cpu:4) ENDIF() SIZE(MEDIUM) diff --git a/ydb/tests/functional/sqs/cloud/ya.make b/ydb/tests/functional/sqs/cloud/ya.make index 8d775ec20f9..e8bfb4ec3e3 100644 --- a/ydb/tests/functional/sqs/cloud/ya.make +++ b/ydb/tests/functional/sqs/cloud/ya.make @@ -13,9 +13,7 @@ IF (SANITIZER_TYPE == "thread") TIMEOUT(2400) SIZE(LARGE) TAG(ya:fat) - REQUIREMENTS( - ram:32 - ) + REQUIREMENTS(ram:32 cpu:2) ELSE() TIMEOUT(600) SIZE(MEDIUM) diff --git a/ydb/tests/functional/sqs/common/ya.make b/ydb/tests/functional/sqs/common/ya.make index bc6522210be..23bc71281c0 100644 --- a/ydb/tests/functional/sqs/common/ya.make +++ b/ydb/tests/functional/sqs/common/ya.make @@ -21,9 +21,7 @@ IF (SANITIZER_TYPE == "thread") TIMEOUT(2400) SIZE(LARGE) TAG(ya:fat) - REQUIREMENTS( - ram:32 - ) + REQUIREMENTS(ram:32 cpu:2) ELSE() TIMEOUT(600) SIZE(MEDIUM) diff --git a/ydb/tests/functional/sqs/large/ya.make b/ydb/tests/functional/sqs/large/ya.make index f49fbc3d188..2b601f02484 100644 --- a/ydb/tests/functional/sqs/large/ya.make +++ b/ydb/tests/functional/sqs/large/ya.make @@ -11,9 +11,7 @@ IF (SANITIZER_TYPE == "thread") TIMEOUT(2400) SIZE(LARGE) TAG(ya:fat) - REQUIREMENTS( - ram:32 - ) + REQUIREMENTS(ram:32 cpu:4) ELSE() TIMEOUT(600) SIZE(MEDIUM) diff --git a/ydb/tests/functional/sqs/merge_split_common_table/fifo/ya.make b/ydb/tests/functional/sqs/merge_split_common_table/fifo/ya.make index 34b0ea66554..f8cb0b71e16 100644 --- a/ydb/tests/functional/sqs/merge_split_common_table/fifo/ya.make +++ b/ydb/tests/functional/sqs/merge_split_common_table/fifo/ya.make @@ -8,16 +8,14 @@ TEST_SRCS( ) IF (SANITIZER_TYPE) - REQUIREMENTS(ram:16) + REQUIREMENTS(ram:32 cpu:4) ENDIF() IF (SANITIZER_TYPE == "thread") TIMEOUT(2400) SIZE(LARGE) TAG(ya:fat) - REQUIREMENTS( - ram:32 - ) + REQUIREMENTS(ram:32 cpu:4) ELSE() TIMEOUT(600) SIZE(MEDIUM) diff --git a/ydb/tests/functional/sqs/merge_split_common_table/std/ya.make b/ydb/tests/functional/sqs/merge_split_common_table/std/ya.make index 4acb2298c41..5fb22259d7b 100644 --- a/ydb/tests/functional/sqs/merge_split_common_table/std/ya.make +++ b/ydb/tests/functional/sqs/merge_split_common_table/std/ya.make @@ -7,7 +7,7 @@ TEST_SRCS( ) IF (SANITIZER_TYPE) - REQUIREMENTS(ram:16) + REQUIREMENTS(ram:32 cpu:4) ENDIF() IF (SANITIZER_TYPE == "thread") diff --git a/ydb/tests/functional/sqs/messaging/ya.make b/ydb/tests/functional/sqs/messaging/ya.make index 4a84bb4887b..663b46d5780 100644 --- a/ydb/tests/functional/sqs/messaging/ya.make +++ b/ydb/tests/functional/sqs/messaging/ya.make @@ -12,9 +12,7 @@ IF (SANITIZER_TYPE == "thread") TIMEOUT(2400) SIZE(LARGE) TAG(ya:fat) - REQUIREMENTS( - ram:32 - ) + REQUIREMENTS(ram:32 cpu:1) ELSE() TIMEOUT(600) SIZE(MEDIUM) diff --git a/ydb/tests/functional/sqs/with_quotas/ya.make b/ydb/tests/functional/sqs/with_quotas/ya.make index 6c6d05ec460..f11f1a8e5c6 100644 --- a/ydb/tests/functional/sqs/with_quotas/ya.make +++ b/ydb/tests/functional/sqs/with_quotas/ya.make @@ -11,9 +11,7 @@ IF (SANITIZER_TYPE == "thread") TIMEOUT(2400) SIZE(LARGE) TAG(ya:fat) - REQUIREMENTS( - ram:32 - ) + REQUIREMENTS(ram:32 cpu:1) ELSE() TIMEOUT(600) SIZE(MEDIUM) diff --git a/ydb/tests/functional/tenants/ya.make b/ydb/tests/functional/tenants/ya.make index 20bfb5e55bf..2119f056469 100644 --- a/ydb/tests/functional/tenants/ya.make +++ b/ydb/tests/functional/tenants/ya.make @@ -30,7 +30,7 @@ PEERDIR( FORK_SUBTESTS() IF (SANITIZER_TYPE) - REQUIREMENTS(ram:10) + REQUIREMENTS(ram:10 cpu:1) ENDIF() END() |