From 18ccb90fec99e9ca35c0286094ffbfc66de850d2 Mon Sep 17 00:00:00 2001 From: Israel Fruchter Date: Sun, 31 Dec 2023 11:58:15 +0200 Subject: [PATCH 1/2] fix(featrues-testcases): disable manager on too small monitor nodes those case doesn't need manager installed, and they are fine with having smaller monitor node, that manager (scylla) can't be installed on. --- test-cases/features/compaction-throughput-limit.yaml | 2 ++ test-cases/features/enospc-30mins.yaml | 2 ++ test-cases/features/per-partition-limit.yaml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/test-cases/features/compaction-throughput-limit.yaml b/test-cases/features/compaction-throughput-limit.yaml index 8b0b8f7a26..356e54873d 100644 --- a/test-cases/features/compaction-throughput-limit.yaml +++ b/test-cases/features/compaction-throughput-limit.yaml @@ -13,3 +13,5 @@ instance_type_monitor: 't2.small' user_prefix: 'compaction-limit' append_scylla_yaml: | auto_snapshot: false + +use_mgmt: false diff --git a/test-cases/features/enospc-30mins.yaml b/test-cases/features/enospc-30mins.yaml index 9e86dc5683..a363152445 100644 --- a/test-cases/features/enospc-30mins.yaml +++ b/test-cases/features/enospc-30mins.yaml @@ -12,3 +12,5 @@ instance_type_loader: 'c5.4xlarge' instance_type_monitor: 't2.small' user_prefix: 'cases-enospc' + +use_mgmt: false diff --git a/test-cases/features/per-partition-limit.yaml b/test-cases/features/per-partition-limit.yaml index 53c9e1346c..14105409ff 100644 --- a/test-cases/features/per-partition-limit.yaml +++ b/test-cases/features/per-partition-limit.yaml @@ -21,3 +21,5 @@ instance_type_loader: 'c5.large' instance_type_monitor: 't2.small' user_prefix: 'per-part-limit' + +use_mgmt: false From 357aef1235c8ca7e3cac0d016289ed32e9401a0e Mon Sep 17 00:00:00 2001 From: Israel Fruchter Date: Sun, 31 Dec 2023 16:00:38 +0200 Subject: [PATCH 2/2] fix(instance_types): update all usages of `t2.small` to `t3.small` --- query_limits_test.py | 2 +- sdcm/sct_runner.py | 2 +- test-cases/features/compaction-throughput-limit.yaml | 2 +- test-cases/features/enospc-30mins.yaml | 2 +- test-cases/features/per-partition-limit.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/query_limits_test.py b/query_limits_test.py index 9a4da7baec..dce31a5cce 100644 --- a/query_limits_test.py +++ b/query_limits_test.py @@ -45,7 +45,7 @@ def setUp(self): db_info = {'n_nodes': 1, 'device_mappings': bdm, 'type': 'm4.4xlarge'} monitor_info = {'n_nodes': 1, 'device_mappings': None, - 'type': 't2.small'} + 'type': 't3.small'} # Use big instance to be not throttled by the network self.init_resources(loader_info=loader_info, db_info=db_info, monitor_info=monitor_info) diff --git a/sdcm/sct_runner.py b/sdcm/sct_runner.py index 9f526ce719..d2bf0771c0 100644 --- a/sdcm/sct_runner.py +++ b/sdcm/sct_runner.py @@ -440,7 +440,7 @@ class AwsSctRunner(SctRunner): CLOUD_PROVIDER = "aws" BASE_IMAGE = "ami-07c2ae35d31367b3e" # Canonical, Ubuntu, 22.04 LTS, amd64 jammy image build on 2022-12-01 SOURCE_IMAGE_REGION = "eu-west-2" # where the source Runner image will be created and copied to other regions - IMAGE_BUILDER_INSTANCE_TYPE = "t2.small" + IMAGE_BUILDER_INSTANCE_TYPE = "t3.small" REGULAR_TEST_INSTANCE_TYPE = "t3.large" # 2 vcpus, 8G, 36 CPU credits/hour LONGTERM_TEST_INSTANCE_TYPE = "r5.large" # 2 vcpus, 16G diff --git a/test-cases/features/compaction-throughput-limit.yaml b/test-cases/features/compaction-throughput-limit.yaml index 356e54873d..6e0e31ac01 100644 --- a/test-cases/features/compaction-throughput-limit.yaml +++ b/test-cases/features/compaction-throughput-limit.yaml @@ -8,7 +8,7 @@ n_monitor_nodes: 1 instance_type_db: 'i4i.xlarge' instance_type_loader: 'c5.large' -instance_type_monitor: 't2.small' +instance_type_monitor: 't3.small' user_prefix: 'compaction-limit' append_scylla_yaml: | diff --git a/test-cases/features/enospc-30mins.yaml b/test-cases/features/enospc-30mins.yaml index a363152445..e3e6294e5e 100644 --- a/test-cases/features/enospc-30mins.yaml +++ b/test-cases/features/enospc-30mins.yaml @@ -9,7 +9,7 @@ n_monitor_nodes: 1 instance_type_db: 'c3.large' # for cassandra we'll use 'm3.large' instance_type_loader: 'c5.4xlarge' -instance_type_monitor: 't2.small' +instance_type_monitor: 't3.small' user_prefix: 'cases-enospc' diff --git a/test-cases/features/per-partition-limit.yaml b/test-cases/features/per-partition-limit.yaml index 14105409ff..160ee55e88 100644 --- a/test-cases/features/per-partition-limit.yaml +++ b/test-cases/features/per-partition-limit.yaml @@ -18,7 +18,7 @@ n_monitor_nodes: 1 instance_type_db: 'i4i.large' instance_type_loader: 'c5.large' -instance_type_monitor: 't2.small' +instance_type_monitor: 't3.small' user_prefix: 'per-part-limit'