diff options
| author | Dmitry Kardymon <kardymon-d@ydb.tech> | 2025-04-01 10:16:43 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-01 10:16:43 +0300 |
| commit | 718e9f529a858dc46433c677ba3087660f044a95 (patch) | |
| tree | ec873f527fa8fad220a2abc08becb6ee56fca4c1 | |
| parent | e056729523ca28d4a26d879306949f2faf67de04 (diff) | |
| download | ydb-718e9f529a858dc46433c677ba3087660f044a95.tar.gz | |
YQ-4084 Remove new fields from harness (#16559)
| -rw-r--r-- | ydb/tests/functional/ydb_cli/test_ydb_recursive_remove.py | 6 | ||||
| -rw-r--r-- | ydb/tests/library/harness/kikimr_config.py | 4 | ||||
| -rw-r--r-- | ydb/tests/library/harness/resources/default_yaml.yml | 13 | ||||
| -rw-r--r-- | ydb/tests/olap/ttl_tiering/base.py | 3 |
4 files changed, 12 insertions, 14 deletions
diff --git a/ydb/tests/functional/ydb_cli/test_ydb_recursive_remove.py b/ydb/tests/functional/ydb_cli/test_ydb_recursive_remove.py index e7ca6ba794..74c2f9a314 100644 --- a/ydb/tests/functional/ydb_cli/test_ydb_recursive_remove.py +++ b/ydb/tests/functional/ydb_cli/test_ydb_recursive_remove.py @@ -4,7 +4,11 @@ import pytest import yatest -CLUSTER_CONFIG = dict(extra_feature_flags=["enable_external_data_sources"]) +CLUSTER_CONFIG = dict( + extra_feature_flags=["enable_external_data_sources"], + query_service_config=dict( + available_external_data_sources=["ObjectStorage"] + )) def bin_from_env(var): diff --git a/ydb/tests/library/harness/kikimr_config.py b/ydb/tests/library/harness/kikimr_config.py index 505cbc3797..a2c0d5b37f 100644 --- a/ydb/tests/library/harness/kikimr_config.py +++ b/ydb/tests/library/harness/kikimr_config.py @@ -164,6 +164,7 @@ class KikimrConfigGenerator(object): default_clusteradmin=None, enable_resource_pools=None, grouped_memory_limiter_config=None, + query_service_config=None, ): if extra_feature_flags is None: extra_feature_flags = [] @@ -365,6 +366,9 @@ class KikimrConfigGenerator(object): if column_shard_config: self.yaml_config["column_shard_config"] = column_shard_config + if query_service_config: + self.yaml_config["query_service_config"] = query_service_config + if grouped_memory_limiter_config: self.yaml_config["grouped_memory_limiter_config"] = grouped_memory_limiter_config diff --git a/ydb/tests/library/harness/resources/default_yaml.yml b/ydb/tests/library/harness/resources/default_yaml.yml index 96dad3c6b3..fc15717150 100644 --- a/ydb/tests/library/harness/resources/default_yaml.yml +++ b/ydb/tests/library/harness/resources/default_yaml.yml @@ -260,16 +260,3 @@ federated_query_config: uri: "" pinger: ping_period: "30s" -query_service_config: - available_external_data_sources: - - ObjectStorage - - ClickHouse - - PostgreSQL - - MySQL - - Ydb - - YT - - Greenplum - - MsSQLServer - - Oracle - - Logging - - Solomon diff --git a/ydb/tests/olap/ttl_tiering/base.py b/ydb/tests/olap/ttl_tiering/base.py index 3a31d2cf83..e0ab5e034d 100644 --- a/ydb/tests/olap/ttl_tiering/base.py +++ b/ydb/tests/olap/ttl_tiering/base.py @@ -46,6 +46,9 @@ class TllTieringTestBase(object): "TX_COLUMNSHARD_ACTUALIZATION": LogLevels.TRACE, "TX_COLUMNSHARD_BLOBS_TIER": LogLevels.DEBUG, }, + query_service_config=dict( + available_external_data_sources=["ObjectStorage"] + ) ) cls.cluster = KiKiMR(config) cls.cluster.start() |