From 005aedff4aabfe3b78f64aa8f02637297fbdee16 Mon Sep 17 00:00:00 2001 From: Alexey Kartashov Date: Wed, 25 Oct 2023 02:32:06 +0200 Subject: [PATCH] Revert "improvement(gce): change `instance_type_db_oracle:` for gemini tests" This reverts commit 6e3d34cd1b9fc6533a4e5a3874fd36ad401b9a81. --- test-cases/cdc/cdc-15m-replication-gemini.yaml | 2 +- test-cases/cdc/cdc-15m-replication-postimage.yaml | 2 +- test-cases/cdc/cdc-15m-replication-preimage.yaml | 2 +- test-cases/cdc/cdc-15m-replication.yaml | 2 +- test-cases/cdc/cdc-replication-longevity.yaml | 2 +- test-cases/features/dns-cluster-5min.yaml | 2 +- test-cases/gemini/gemini-1tb-10h.yaml | 2 +- test-cases/gemini/gemini-3h-ics-cdc-with-nemesis.yaml | 2 +- test-cases/gemini/gemini-3h-ics-with-nondisruptive-nemesis.yaml | 2 +- test-cases/gemini/gemini-3h-with-nemesis.yaml | 2 +- test-cases/gemini/gemini-3h-with-nondisruptive-nemesis.yaml | 2 +- test-cases/gemini/gemini-basic-3h-ics.yaml | 2 +- test-cases/gemini/gemini-basic-3h.yaml | 2 +- test-cases/performance/ycsb/perf-base.yaml | 2 +- .../test_scylla_yaml_builders/cdc-replication-longevity.yaml | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/test-cases/cdc/cdc-15m-replication-gemini.yaml b/test-cases/cdc/cdc-15m-replication-gemini.yaml index 5993f9e8a0..d6dba294ee 100644 --- a/test-cases/cdc/cdc-15m-replication-gemini.yaml +++ b/test-cases/cdc/cdc-15m-replication-gemini.yaml @@ -7,7 +7,7 @@ n_db_nodes: 3 instance_type_db: 'i4i.large' n_test_oracle_db_nodes: 1 -instance_type_db_oracle: 'i4i.large' +instance_type_db_oracle: 'i3.large' n_loaders: 1 instance_type_loader: 'c5.large' diff --git a/test-cases/cdc/cdc-15m-replication-postimage.yaml b/test-cases/cdc/cdc-15m-replication-postimage.yaml index e801549c7f..d15da60ba7 100644 --- a/test-cases/cdc/cdc-15m-replication-postimage.yaml +++ b/test-cases/cdc/cdc-15m-replication-postimage.yaml @@ -7,7 +7,7 @@ n_db_nodes: 3 instance_type_db: 'i4i.large' n_test_oracle_db_nodes: 1 -instance_type_db_oracle: 'i4i.large' +instance_type_db_oracle: 'i3.large' n_loaders: 1 instance_type_loader: 'c5.large' diff --git a/test-cases/cdc/cdc-15m-replication-preimage.yaml b/test-cases/cdc/cdc-15m-replication-preimage.yaml index 38139f957e..32f7d16bb2 100644 --- a/test-cases/cdc/cdc-15m-replication-preimage.yaml +++ b/test-cases/cdc/cdc-15m-replication-preimage.yaml @@ -7,7 +7,7 @@ n_db_nodes: 3 instance_type_db: 'i4i.large' n_test_oracle_db_nodes: 1 -instance_type_db_oracle: 'i4i.large' +instance_type_db_oracle: 'i3.large' n_loaders: 1 instance_type_loader: 'c5.large' diff --git a/test-cases/cdc/cdc-15m-replication.yaml b/test-cases/cdc/cdc-15m-replication.yaml index 51be602091..5562112277 100644 --- a/test-cases/cdc/cdc-15m-replication.yaml +++ b/test-cases/cdc/cdc-15m-replication.yaml @@ -7,7 +7,7 @@ n_db_nodes: 3 instance_type_db: 'i4i.large' n_test_oracle_db_nodes: 1 -instance_type_db_oracle: 'i4i.large' +instance_type_db_oracle: 'i3.large' n_loaders: 1 instance_type_loader: 'c5.large' diff --git a/test-cases/cdc/cdc-replication-longevity.yaml b/test-cases/cdc/cdc-replication-longevity.yaml index 9f82d5c993..52f9835b05 100644 --- a/test-cases/cdc/cdc-replication-longevity.yaml +++ b/test-cases/cdc/cdc-replication-longevity.yaml @@ -7,7 +7,7 @@ n_db_nodes: 3 instance_type_db: 'i4i.large' n_test_oracle_db_nodes: 1 -instance_type_db_oracle: 'i4i.large' +instance_type_db_oracle: 'i3.large' n_loaders: 1 instance_type_loader: 'c5.large' diff --git a/test-cases/features/dns-cluster-5min.yaml b/test-cases/features/dns-cluster-5min.yaml index 89552370d3..e722ad79f2 100644 --- a/test-cases/features/dns-cluster-5min.yaml +++ b/test-cases/features/dns-cluster-5min.yaml @@ -8,7 +8,7 @@ n_db_nodes: 3 n_loaders: 1 n_monitor_nodes: 1 -instance_type_db: 'i4i.xlarge' +instance_type_db: 'i4i.2xlarge' instance_type_loader: 'c5.4xlarge' instance_type_monitor: 't2.small' diff --git a/test-cases/gemini/gemini-1tb-10h.yaml b/test-cases/gemini/gemini-1tb-10h.yaml index 3becc9c822..bc82adcbc6 100644 --- a/test-cases/gemini/gemini-1tb-10h.yaml +++ b/test-cases/gemini/gemini-1tb-10h.yaml @@ -24,4 +24,4 @@ gemini_cmd: "gemini -d --duration 8h --warmup 2h -c 50 \ gemini_schema_url: 'https://s3.amazonaws.com/scylla-gemini/Binaries/schema.json' # currently is not used db_type: mixed_scylla -instance_type_db_oracle: 'i4i.16xlarge' +instance_type_db_oracle: 'i3.16xlarge' diff --git a/test-cases/gemini/gemini-3h-ics-cdc-with-nemesis.yaml b/test-cases/gemini/gemini-3h-ics-cdc-with-nemesis.yaml index 8d653eb5d0..421a8fa622 100644 --- a/test-cases/gemini/gemini-3h-ics-cdc-with-nemesis.yaml +++ b/test-cases/gemini/gemini-3h-ics-cdc-with-nemesis.yaml @@ -30,5 +30,5 @@ gemini_table_options: stress_cdclog_reader_cmd: "cdc-stressor -duration 215m -stream-query-round-duration 30s" db_type: mixed_scylla -instance_type_db_oracle: 'i4i.8xlarge' +instance_type_db_oracle: 'i3.8xlarge' oracle_scylla_version: "2021.1.15" diff --git a/test-cases/gemini/gemini-3h-ics-with-nondisruptive-nemesis.yaml b/test-cases/gemini/gemini-3h-ics-with-nondisruptive-nemesis.yaml index 2bc80e5456..0de5337a20 100644 --- a/test-cases/gemini/gemini-3h-ics-with-nondisruptive-nemesis.yaml +++ b/test-cases/gemini/gemini-3h-ics-with-nondisruptive-nemesis.yaml @@ -22,5 +22,5 @@ gemini_cmd: "gemini -d --duration 10800s --warmup 1800s -c 50 -m mixed -f --non- gemini_schema_url: 'https://s3.amazonaws.com/scylla-gemini/Binaries/schema.json' # currently is not used db_type: mixed_scylla -instance_type_db_oracle: 'i4i.8xlarge' +instance_type_db_oracle: 'i3.8xlarge' oracle_scylla_version: "2021.1.15" diff --git a/test-cases/gemini/gemini-3h-with-nemesis.yaml b/test-cases/gemini/gemini-3h-with-nemesis.yaml index 1987194331..f8c132eb7a 100644 --- a/test-cases/gemini/gemini-3h-with-nemesis.yaml +++ b/test-cases/gemini/gemini-3h-with-nemesis.yaml @@ -27,4 +27,4 @@ gemini_cmd: "gemini -d --duration 3h --warmup 30m \ gemini_schema_url: 'https://s3.amazonaws.com/scylla-gemini/Binaries/schema.json' # currently is not used db_type: mixed_scylla -instance_type_db_oracle: 'i4i.8xlarge' +instance_type_db_oracle: 'i3.8xlarge' diff --git a/test-cases/gemini/gemini-3h-with-nondisruptive-nemesis.yaml b/test-cases/gemini/gemini-3h-with-nondisruptive-nemesis.yaml index 9a0b50a216..3f149cb837 100644 --- a/test-cases/gemini/gemini-3h-with-nondisruptive-nemesis.yaml +++ b/test-cases/gemini/gemini-3h-with-nondisruptive-nemesis.yaml @@ -24,4 +24,4 @@ gemini_cmd: "gemini -d --duration 10800s --warmup 1800s -c 50 \ gemini_schema_url: 'https://s3.amazonaws.com/scylla-gemini/Binaries/schema.json' # currently is not used db_type: mixed_scylla -instance_type_db_oracle: 'i4i.8xlarge' +instance_type_db_oracle: 'i3.8xlarge' diff --git a/test-cases/gemini/gemini-basic-3h-ics.yaml b/test-cases/gemini/gemini-basic-3h-ics.yaml index 79ee5387e8..29ad4c1704 100644 --- a/test-cases/gemini/gemini-basic-3h-ics.yaml +++ b/test-cases/gemini/gemini-basic-3h-ics.yaml @@ -20,5 +20,5 @@ gemini_cmd: "gemini -d --duration 10800s --warmup 1800s -c 50 -m mixed -f --non- gemini_schema_url: 'https://s3.amazonaws.com/scylla-gemini/Binaries/schema.json' # currently is not used db_type: mixed_scylla -instance_type_db_oracle: 'i4i.8xlarge' +instance_type_db_oracle: 'i3.8xlarge' oracle_scylla_version: "2021.1.15" diff --git a/test-cases/gemini/gemini-basic-3h.yaml b/test-cases/gemini/gemini-basic-3h.yaml index e27b1c0057..e2b3fe56ac 100644 --- a/test-cases/gemini/gemini-basic-3h.yaml +++ b/test-cases/gemini/gemini-basic-3h.yaml @@ -21,4 +21,4 @@ gemini_cmd: "gemini -d --duration 10800s --warmup 1800s -c 50 \ gemini_schema_url: 'https://s3.amazonaws.com/scylla-gemini/Binaries/schema.json' # currently is not used db_type: mixed_scylla -instance_type_db_oracle: 'i4i.8xlarge' +instance_type_db_oracle: 'i3.8xlarge' diff --git a/test-cases/performance/ycsb/perf-base.yaml b/test-cases/performance/ycsb/perf-base.yaml index e3634de333..11847f4799 100644 --- a/test-cases/performance/ycsb/perf-base.yaml +++ b/test-cases/performance/ycsb/perf-base.yaml @@ -48,7 +48,7 @@ n_db_nodes: 3 n_loaders: 1 n_monitor_nodes: 1 -instance_type_db: 'i3.4xlarge' +instance_type_db: 'i4i.4xlarge' instance_type_loader: 'c5.9xlarge' authenticator: 'PasswordAuthenticator' diff --git a/unit_tests/test_data/test_scylla_yaml_builders/cdc-replication-longevity.yaml b/unit_tests/test_data/test_scylla_yaml_builders/cdc-replication-longevity.yaml index a080e2fd44..27cbf9f886 100644 --- a/unit_tests/test_data/test_scylla_yaml_builders/cdc-replication-longevity.yaml +++ b/unit_tests/test_data/test_scylla_yaml_builders/cdc-replication-longevity.yaml @@ -7,7 +7,7 @@ n_db_nodes: 3 instance_type_db: 'i4i.large' n_test_oracle_db_nodes: 1 -instance_type_db_oracle: 'i4i.large' +instance_type_db_oracle: 'i3.large' n_loaders: 1 instance_type_loader: 'c5.large'