From c89dfb61cd39592128ff0c8b752a51b4ddd94c13 Mon Sep 17 00:00:00 2001 From: Solonas Gousteris Date: Wed, 15 Mar 2023 15:06:37 +0200 Subject: [PATCH] si_settings: remove AUTO from cloud storage type --- tests/rptest/services/redpanda.py | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/tests/rptest/services/redpanda.py b/tests/rptest/services/redpanda.py index 31d0ef10fc138..556d3a7eafccf 100644 --- a/tests/rptest/services/redpanda.py +++ b/tests/rptest/services/redpanda.py @@ -154,8 +154,6 @@ class CloudStorageType(IntEnum): S3 = 1 # Use Azure ABS on dedicated nodes, or azurite in docker ABS = 2 - # Auto-select the cloud's storage service on dedicated nodes, or use minio+S3 on docker - AUTO = 3 def one_or_many(value): @@ -319,8 +317,6 @@ class SISettings: GLOBAL_ABS_SHARED_KEY = "abs_shared_key" GLOBAL_CLOUD_PROVIDER = "cloud_provider" - DEDICATED_NODE_KEY = "dedicated_nodes" - # The account and key to use with local Azurite testing. # These are the default Azurite (Azure emulator) storage account and shared key. # Both are readily available in the docs. @@ -356,30 +352,13 @@ def __init__(self, quickly when they wait for uploads to complete. """ - self.cloud_storage_type = CloudStorageType.AUTO + self.cloud_storage_type = get_cloud_storage_type()[0] if hasattr(test_context, 'injected_args') \ and test_context.injected_args is not None \ and 'cloud_storage_type' in test_context.injected_args: self.cloud_storage_type = test_context.injected_args[ 'cloud_storage_type'] - if self.cloud_storage_type == CloudStorageType.AUTO: - dedicated_nodes = test_context.globals.get(self.DEDICATED_NODE_KEY, - False) - if dedicated_nodes: - abs_shared_key = test_context.globals.get( - self.GLOBAL_ABS_SHARED_KEY, None) - s3_region = test_context.globals.get(self.GLOBAL_S3_REGION_KEY, - None) - if abs_shared_key is not None: - self.cloud_storage_type = CloudStorageType.ABS - elif s3_region is not None: - self.cloud_storage_type = CloudStorageType.S3 - else: - raise RuntimeError("Cannot autodetect cloud storage") - else: - self.cloud_storage_type = CloudStorageType.S3 - if self.cloud_storage_type == CloudStorageType.S3: self.cloud_storage_credentials_source = cloud_storage_credentials_source self.cloud_storage_access_key = cloud_storage_access_key