From f784c72f2213035e5bcf3e4a21adc284046021ae Mon Sep 17 00:00:00 2001 From: yarongilor Date: Thu, 30 May 2024 16:53:29 +0300 Subject: [PATCH] fix(tablets): remove tablets and consistent-topology-changes from experimental features tablets feature is not experimental anymore and is default to be enabled. tablets is dependent on consistent-topology-changes. refs: https://github.com/scylladb/scylladb/pull/18898 --- configurations/raft/enable_raft_experimental.yaml | 3 --- configurations/rolling-upgrade-with-tablets.yaml | 2 -- configurations/tablets-initial-32.yaml | 3 --- configurations/tablets.yaml | 4 ---- defaults/test_default.yaml | 1 - docs/configuration_options.md | 1 - .../oss/raft/gemini-8h-large-num-columns.jenkinsfile | 2 +- .../raft/longevity-100gb-4h-with-raft.jenkinsfile | 2 +- ...ongevity-150gb-asymmetric-cluster-12h.jenkinsfile | 2 +- .../oss/raft/longevity-1tb-7days.jenkinsfile | 2 +- ...tion-and-tls-ssl-1dis-2nondis-nemesis.jenkinsfile | 2 +- .../oss/raft/longevity-5000-tables.jenkinsfile | 2 +- ...longevity-50gb-asymmetric-cluster-12h.jenkinsfile | 2 +- .../raft/longevity-alternator-200gb-48h.jenkinsfile | 2 +- .../oss/raft/longevity-cdc-3d-400gb.jenkinsfile | 2 +- ...cdc-8h-multi-dc-topology-changes-raft.jenkinsfile | 2 +- .../raft/longevity-counters-6h-multidc.jenkinsfile | 2 +- ...cluster-with-schema-changes-with-raft.jenkinsfile | 2 +- .../raft/longevity-large-collections-12h.jenkinsfile | 2 +- ...gevity-large-partition-200k-pks-4days.jenkinsfile | 2 +- .../raft/longevity-large-partition-4days.jenkinsfile | 2 +- .../raft/longevity-large-partition-8h.jenkinsfile | 2 +- .../raft/longevity-lwt-24h-1dis-2nondis.jenkinsfile | 2 +- .../oss/raft/longevity-lwt-24h-multidc.jenkinsfile | 2 +- .../oss/raft/longevity-lwt-500G-3d.jenkinsfile | 2 +- ...hema-changes-with-disruptive-24h-raft.jenkinsfile | 2 +- ...longevity-schema-changes-3h-with-raft.jenkinsfile | 2 +- .../oss/raft/scale-40-60-cluster-test.jenkinsfile | 2 +- .../oss/tablets/longevity-100gb-4h.jenkinsfile | 2 +- .../oss/tablets/longevity-harry-2h.jenkinsfile | 2 +- .../tablets/longevity-large-partition-8h.jenkinsfile | 2 +- .../longevity-multi-keyspaces-60h.jenkinsfile | 2 +- .../tablets/longevity-multidc-multirack.jenkinsfile | 2 +- .../oss/tablets/scale-5000-tables.jenkinsfile | 2 +- sct.py | 4 ++-- sdcm/sct_config.py | 4 ---- upgrade_test.py | 12 ------------ 37 files changed, 30 insertions(+), 60 deletions(-) delete mode 100644 configurations/raft/enable_raft_experimental.yaml delete mode 100644 configurations/tablets.yaml diff --git a/configurations/raft/enable_raft_experimental.yaml b/configurations/raft/enable_raft_experimental.yaml deleted file mode 100644 index 38412d5c6a..0000000000 --- a/configurations/raft/enable_raft_experimental.yaml +++ /dev/null @@ -1,3 +0,0 @@ -append_scylla_yaml: | - experimental_features: - - consistent-topology-changes diff --git a/configurations/rolling-upgrade-with-tablets.yaml b/configurations/rolling-upgrade-with-tablets.yaml index 408a503c47..5e31d24638 100644 --- a/configurations/rolling-upgrade-with-tablets.yaml +++ b/configurations/rolling-upgrade-with-tablets.yaml @@ -4,5 +4,3 @@ stress_after_cluster_upgrade: cassandra-stress read no-warmup cl=QUORUM n=302004 n_db_nodes: 4 - -enable_tablets_on_upgrade: true diff --git a/configurations/tablets-initial-32.yaml b/configurations/tablets-initial-32.yaml index 315ea1a1db..0e387323bc 100644 --- a/configurations/tablets-initial-32.yaml +++ b/configurations/tablets-initial-32.yaml @@ -1,5 +1,2 @@ append_scylla_yaml: | - experimental_features: - - tablets - - consistent-topology-changes tablets_initial_scale_factor: 4 diff --git a/configurations/tablets.yaml b/configurations/tablets.yaml deleted file mode 100644 index 79e89be1e3..0000000000 --- a/configurations/tablets.yaml +++ /dev/null @@ -1,4 +0,0 @@ -append_scylla_yaml: | - experimental_features: - - tablets - - consistent-topology-changes diff --git a/defaults/test_default.yaml b/defaults/test_default.yaml index 96c2ebed1a..64de27b699 100644 --- a/defaults/test_default.yaml +++ b/defaults/test_default.yaml @@ -136,7 +136,6 @@ scylla_version: '' test_upgrade_from_installed_3_1_0: false target_upgrade_version: '' disable_raft: true -enable_tablets_on_upgrade: false stress_cdclog_reader_cmd: "cdc-stressor -stream-query-round-duration 30s" diff --git a/docs/configuration_options.md b/docs/configuration_options.md index d6300fa02f..dab2cbc50a 100644 --- a/docs/configuration_options.md +++ b/docs/configuration_options.md @@ -277,7 +277,6 @@ | **new_version** | Assign new upgrade version, use it to upgrade to specific minor release. eg: 3.0.1 | N/A | SCT_NEW_VERSION | **target_upgrade_version** | Assign target upgrade version, use for decide if the truncate entries test should be run. This test should be performed in case the target upgrade version >= 3.1 | N/A | SCT_TARGET_UPGRADE_VERSION | **disable_raft** | As for now, raft will be enable by default in all [upgrade] tests, so this flag will allow usto still run [upgrade] test without raft enabled (or disabling raft), so we will have bettercoverage | True | SCT_DISABLE_RAFT -| **enable_tablets_on_upgrade** | By default, the tablets feature is disabled. With this parameter, created for the upgrade test,the tablets feature will only be enabled after the upgrade | N/A | SCT_ENABLE_TABLETS_ON_UPGRADE | **upgrade_node_packages** | | N/A | SCT_UPGRADE_NODE_PACKAGES | **test_sst3** | | N/A | SCT_TEST_SST3 | **test_upgrade_from_installed_3_1_0** | Enable an option for installed 3.1.0 for work around a scylla issue if it's true | N/A | SCT_TEST_UPGRADE_FROM_INSTALLED_3_1_0 diff --git a/jenkins-pipelines/oss/raft/gemini-8h-large-num-columns.jenkinsfile b/jenkins-pipelines/oss/raft/gemini-8h-large-num-columns.jenkinsfile index 6cab71c85c..130d210e3b 100644 --- a/jenkins-pipelines/oss/raft/gemini-8h-large-num-columns.jenkinsfile +++ b/jenkins-pipelines/oss/raft/gemini-8h-large-num-columns.jenkinsfile @@ -7,7 +7,7 @@ longevityPipeline( backend: 'aws', region: 'eu-west-1', test_name: 'gemini_test.GeminiTest.test_load_random_with_nemesis', - test_config: '''["test-cases/gemini/gemini-8h-large-num-columns.yaml", "configurations/raft/enable_raft_experimental.yaml"]''', + test_config: '''["test-cases/gemini/gemini-8h-large-num-columns.yaml"]''', timeout: [time: 540, unit: 'MINUTES'], email_recipients: 'qa@scylladb.com' diff --git a/jenkins-pipelines/oss/raft/longevity-100gb-4h-with-raft.jenkinsfile b/jenkins-pipelines/oss/raft/longevity-100gb-4h-with-raft.jenkinsfile index 2093832fce..c50c6dc968 100644 --- a/jenkins-pipelines/oss/raft/longevity-100gb-4h-with-raft.jenkinsfile +++ b/jenkins-pipelines/oss/raft/longevity-100gb-4h-with-raft.jenkinsfile @@ -7,6 +7,6 @@ longevityPipeline( backend: 'aws', region: 'eu-west-1', test_name: 'longevity_test.LongevityTest.test_custom_time', - test_config: '''["test-cases/longevity/longevity-100gb-4h.yaml", "configurations/raft/enable_raft_experimental.yaml"]''' + test_config: '''["test-cases/longevity/longevity-100gb-4h.yaml"]''' ) diff --git a/jenkins-pipelines/oss/raft/longevity-150gb-asymmetric-cluster-12h.jenkinsfile b/jenkins-pipelines/oss/raft/longevity-150gb-asymmetric-cluster-12h.jenkinsfile index 59a1248b2b..0247af0631 100644 --- a/jenkins-pipelines/oss/raft/longevity-150gb-asymmetric-cluster-12h.jenkinsfile +++ b/jenkins-pipelines/oss/raft/longevity-150gb-asymmetric-cluster-12h.jenkinsfile @@ -7,5 +7,5 @@ longevityPipeline( backend: 'aws', region: 'eu-west-1', test_name: 'longevity_test.LongevityTest.test_custom_time', - test_config: '''["test-cases/longevity/longevity-150GB-12h-autorization-LimitedMonkey.yaml", "configurations/db-nodes-shards-random.yaml", "configurations/raft/enable_raft_experimental.yaml"]''' + test_config: '''["test-cases/longevity/longevity-150GB-12h-autorization-LimitedMonkey.yaml", "configurations/db-nodes-shards-random.yaml"]''' ) diff --git a/jenkins-pipelines/oss/raft/longevity-1tb-7days.jenkinsfile b/jenkins-pipelines/oss/raft/longevity-1tb-7days.jenkinsfile index c31364ea9a..90bf5c70a5 100644 --- a/jenkins-pipelines/oss/raft/longevity-1tb-7days.jenkinsfile +++ b/jenkins-pipelines/oss/raft/longevity-1tb-7days.jenkinsfile @@ -7,6 +7,6 @@ longevityPipeline( backend: 'aws', region: 'eu-west-1', test_name: 'longevity_test.LongevityTest.test_custom_time', - test_config: '''["test-cases/longevity/longevity-1TB-5days-authorization-and-tls-ssl.yaml", "configurations/raft/enable_raft_experimental.yaml"]''' + test_config: '''["test-cases/longevity/longevity-1TB-5days-authorization-and-tls-ssl.yaml"]''' ) diff --git a/jenkins-pipelines/oss/raft/longevity-2TB-48h-authorization-and-tls-ssl-1dis-2nondis-nemesis.jenkinsfile b/jenkins-pipelines/oss/raft/longevity-2TB-48h-authorization-and-tls-ssl-1dis-2nondis-nemesis.jenkinsfile index e7220bfe22..48e5b81d13 100644 --- a/jenkins-pipelines/oss/raft/longevity-2TB-48h-authorization-and-tls-ssl-1dis-2nondis-nemesis.jenkinsfile +++ b/jenkins-pipelines/oss/raft/longevity-2TB-48h-authorization-and-tls-ssl-1dis-2nondis-nemesis.jenkinsfile @@ -7,6 +7,6 @@ longevityPipeline( backend: 'aws', region: 'eu-west-1', test_name: 'longevity_test.LongevityTest.test_custom_time', - test_config: '''["test-cases/longevity/longevity-2TB-48h-authorization-and-tls-ssl-1dis-2nondis-nemesis.yaml", "configurations/raft/enable_raft_experimental.yaml"]''' + test_config: '''["test-cases/longevity/longevity-2TB-48h-authorization-and-tls-ssl-1dis-2nondis-nemesis.yaml"]''' ) diff --git a/jenkins-pipelines/oss/raft/longevity-5000-tables.jenkinsfile b/jenkins-pipelines/oss/raft/longevity-5000-tables.jenkinsfile index c51d88fc21..f1ed229068 100644 --- a/jenkins-pipelines/oss/raft/longevity-5000-tables.jenkinsfile +++ b/jenkins-pipelines/oss/raft/longevity-5000-tables.jenkinsfile @@ -7,7 +7,7 @@ longevityPipeline( backend: 'aws', region: 'eu-west-1', test_name: 'longevity_test.LongevityTest.test_user_batch_custom_time', - test_config: '''["test-cases/scale/longevity-5000-tables.yaml", "configurations/raft/enable_raft_experimental.yaml"]''', + test_config: '''["test-cases/scale/longevity-5000-tables.yaml"]''', timeout: [time: 4440, unit: 'MINUTES'], ) diff --git a/jenkins-pipelines/oss/raft/longevity-50gb-asymmetric-cluster-12h.jenkinsfile b/jenkins-pipelines/oss/raft/longevity-50gb-asymmetric-cluster-12h.jenkinsfile index 59a1248b2b..0247af0631 100644 --- a/jenkins-pipelines/oss/raft/longevity-50gb-asymmetric-cluster-12h.jenkinsfile +++ b/jenkins-pipelines/oss/raft/longevity-50gb-asymmetric-cluster-12h.jenkinsfile @@ -7,5 +7,5 @@ longevityPipeline( backend: 'aws', region: 'eu-west-1', test_name: 'longevity_test.LongevityTest.test_custom_time', - test_config: '''["test-cases/longevity/longevity-150GB-12h-autorization-LimitedMonkey.yaml", "configurations/db-nodes-shards-random.yaml", "configurations/raft/enable_raft_experimental.yaml"]''' + test_config: '''["test-cases/longevity/longevity-150GB-12h-autorization-LimitedMonkey.yaml", "configurations/db-nodes-shards-random.yaml"]''' ) diff --git a/jenkins-pipelines/oss/raft/longevity-alternator-200gb-48h.jenkinsfile b/jenkins-pipelines/oss/raft/longevity-alternator-200gb-48h.jenkinsfile index 6607ca8bfe..97c30bcffd 100644 --- a/jenkins-pipelines/oss/raft/longevity-alternator-200gb-48h.jenkinsfile +++ b/jenkins-pipelines/oss/raft/longevity-alternator-200gb-48h.jenkinsfile @@ -7,7 +7,7 @@ longevityPipeline( backend: 'aws', region: 'eu-west-1', test_name: 'longevity_test.LongevityTest.test_custom_time', - test_config: '''["test-cases/longevity/longevity-alternator-200GB-48h.yaml", "configurations/raft/enable_raft_experimental.yaml"]''', + test_config: '''["test-cases/longevity/longevity-alternator-200GB-48h.yaml"]''', email_recipients: 'qa@scylladb.com' ) diff --git a/jenkins-pipelines/oss/raft/longevity-cdc-3d-400gb.jenkinsfile b/jenkins-pipelines/oss/raft/longevity-cdc-3d-400gb.jenkinsfile index 3d04a2475f..6123a83693 100644 --- a/jenkins-pipelines/oss/raft/longevity-cdc-3d-400gb.jenkinsfile +++ b/jenkins-pipelines/oss/raft/longevity-cdc-3d-400gb.jenkinsfile @@ -7,6 +7,6 @@ longevityPipeline( backend: 'aws', region: 'eu-west-1', test_name: 'longevity_test.LongevityTest.test_custom_time', - test_config: '''["test-cases/longevity/longevity-cdc-3d-400gb.yaml", "configurations/raft/enable_raft_experimental.yaml"]''' + test_config: '''["test-cases/longevity/longevity-cdc-3d-400gb.yaml"]''' ) diff --git a/jenkins-pipelines/oss/raft/longevity-cdc-8h-multi-dc-topology-changes-raft.jenkinsfile b/jenkins-pipelines/oss/raft/longevity-cdc-8h-multi-dc-topology-changes-raft.jenkinsfile index 1fe1055580..9de9f5c0e2 100644 --- a/jenkins-pipelines/oss/raft/longevity-cdc-8h-multi-dc-topology-changes-raft.jenkinsfile +++ b/jenkins-pipelines/oss/raft/longevity-cdc-8h-multi-dc-topology-changes-raft.jenkinsfile @@ -7,6 +7,6 @@ longevityPipeline( backend: 'aws', region: '''["eu-west-1", "us-east-1"]''', test_name: 'longevity_test.LongevityTest.test_custom_time', - test_config: '''["test-cases/longevity/longevity-cdc-100gb-8h-multi-dc-topology-changes.yaml", "configurations/raft/enable_raft_experimental.yaml"]''' + test_config: '''["test-cases/longevity/longevity-cdc-100gb-8h-multi-dc-topology-changes.yaml"]''' ) diff --git a/jenkins-pipelines/oss/raft/longevity-counters-6h-multidc.jenkinsfile b/jenkins-pipelines/oss/raft/longevity-counters-6h-multidc.jenkinsfile index 2f4ae99019..d2b149b884 100644 --- a/jenkins-pipelines/oss/raft/longevity-counters-6h-multidc.jenkinsfile +++ b/jenkins-pipelines/oss/raft/longevity-counters-6h-multidc.jenkinsfile @@ -7,6 +7,6 @@ longevityPipeline( backend: 'aws', region: '''["eu-west-1", "us-west-2", "us-east-1"]''', test_name: 'longevity_test.LongevityTest.test_custom_time', - test_config: '''["test-cases/longevity/longevity-counters-multidc.yaml", "configurations/raft/enable_raft_experimental.yaml"]''' + test_config: '''["test-cases/longevity/longevity-counters-multidc.yaml"]''' ) diff --git a/jenkins-pipelines/oss/raft/longevity-double-cluster-with-schema-changes-with-raft.jenkinsfile b/jenkins-pipelines/oss/raft/longevity-double-cluster-with-schema-changes-with-raft.jenkinsfile index b5b2e7b069..7f7a20a3c1 100644 --- a/jenkins-pipelines/oss/raft/longevity-double-cluster-with-schema-changes-with-raft.jenkinsfile +++ b/jenkins-pipelines/oss/raft/longevity-double-cluster-with-schema-changes-with-raft.jenkinsfile @@ -7,7 +7,7 @@ longevityPipeline( backend: 'aws', region: 'eu-west-1', test_name: 'longevity_test.LongevityTest.test_custom_time', - test_config: '''["test-cases/longevity/longevity-change-cluster-size-by-2-times.yaml", "configurations/raft/enable_raft_experimental.yaml"]''', + test_config: '''["test-cases/longevity/longevity-change-cluster-size-by-2-times.yaml"]''', timeout: [time: 820, unit: 'MINUTES'] ) diff --git a/jenkins-pipelines/oss/raft/longevity-large-collections-12h.jenkinsfile b/jenkins-pipelines/oss/raft/longevity-large-collections-12h.jenkinsfile index 84c24c1914..3c380c743b 100644 --- a/jenkins-pipelines/oss/raft/longevity-large-collections-12h.jenkinsfile +++ b/jenkins-pipelines/oss/raft/longevity-large-collections-12h.jenkinsfile @@ -7,6 +7,6 @@ longevityPipeline( backend: 'aws', region: 'eu-west-1', test_name: 'longevity_test.LongevityTest.test_custom_time', - test_config: '''["test-cases/longevity/longevity-large-collections-12h.yaml", "configurations/raft/enable_raft_experimental.yaml"]''' + test_config: '''["test-cases/longevity/longevity-large-collections-12h.yaml"]''' ) diff --git a/jenkins-pipelines/oss/raft/longevity-large-partition-200k-pks-4days.jenkinsfile b/jenkins-pipelines/oss/raft/longevity-large-partition-200k-pks-4days.jenkinsfile index 3b4b231105..f1bf914fac 100644 --- a/jenkins-pipelines/oss/raft/longevity-large-partition-200k-pks-4days.jenkinsfile +++ b/jenkins-pipelines/oss/raft/longevity-large-partition-200k-pks-4days.jenkinsfile @@ -7,6 +7,6 @@ longevityPipeline( backend: 'aws', region: 'eu-west-1', test_name: 'longevity_large_partition_test.LargePartitionLongevityTest.test_large_partition_longevity', - test_config: '''["test-cases/longevity/longevity-large-partition-200k_pks-4days.yaml", "configurations/raft/enable_raft_experimental.yaml"]''' + test_config: '''["test-cases/longevity/longevity-large-partition-200k_pks-4days.yaml"]''' ) diff --git a/jenkins-pipelines/oss/raft/longevity-large-partition-4days.jenkinsfile b/jenkins-pipelines/oss/raft/longevity-large-partition-4days.jenkinsfile index 4c2bba8248..a8c57ac329 100644 --- a/jenkins-pipelines/oss/raft/longevity-large-partition-4days.jenkinsfile +++ b/jenkins-pipelines/oss/raft/longevity-large-partition-4days.jenkinsfile @@ -7,6 +7,6 @@ longevityPipeline( backend: 'aws', region: 'eu-west-1', test_name: 'longevity_large_partition_test.LargePartitionLongevityTest.test_large_partition_longevity', - test_config: '''["test-cases/longevity/longevity-large-partition-4days.yaml", "configurations/raft/enable_raft_experimental.yaml"]''' + test_config: '''["test-cases/longevity/longevity-large-partition-4days.yaml"]''' ) diff --git a/jenkins-pipelines/oss/raft/longevity-large-partition-8h.jenkinsfile b/jenkins-pipelines/oss/raft/longevity-large-partition-8h.jenkinsfile index d4872dede2..619d3f76d4 100644 --- a/jenkins-pipelines/oss/raft/longevity-large-partition-8h.jenkinsfile +++ b/jenkins-pipelines/oss/raft/longevity-large-partition-8h.jenkinsfile @@ -7,6 +7,6 @@ longevityPipeline( backend: 'aws', region: 'eu-west-1', test_name: 'longevity_large_partition_test.LargePartitionLongevityTest.test_large_partition_longevity', - test_config: '''["test-cases/longevity/longevity-large-partition-8h.yaml", "configurations/raft/enable_raft_experimental.yaml"]''' + test_config: '''["test-cases/longevity/longevity-large-partition-8h.yaml"]''' ) diff --git a/jenkins-pipelines/oss/raft/longevity-lwt-24h-1dis-2nondis.jenkinsfile b/jenkins-pipelines/oss/raft/longevity-lwt-24h-1dis-2nondis.jenkinsfile index 95e0b6b3c7..f76177ef7c 100644 --- a/jenkins-pipelines/oss/raft/longevity-lwt-24h-1dis-2nondis.jenkinsfile +++ b/jenkins-pipelines/oss/raft/longevity-lwt-24h-1dis-2nondis.jenkinsfile @@ -7,6 +7,6 @@ longevityPipeline( backend: 'aws', region: 'eu-west-1', test_name: 'longevity_lwt_test.LWTLongevityTest.test_lwt_longevity', - test_config: '''["test-cases/longevity/longevity-lwt-basic-24h-1dis-2nondis.yaml", "configurations/raft/enable_raft_experimental.yaml"]''' + test_config: '''["test-cases/longevity/longevity-lwt-basic-24h-1dis-2nondis.yaml"]''' ) diff --git a/jenkins-pipelines/oss/raft/longevity-lwt-24h-multidc.jenkinsfile b/jenkins-pipelines/oss/raft/longevity-lwt-24h-multidc.jenkinsfile index c0fb2efe34..5190c0e5b8 100644 --- a/jenkins-pipelines/oss/raft/longevity-lwt-24h-multidc.jenkinsfile +++ b/jenkins-pipelines/oss/raft/longevity-lwt-24h-multidc.jenkinsfile @@ -7,6 +7,6 @@ longevityPipeline( backend: 'aws', region: '''["eu-west-1", "us-west-2", "us-east-1"]''', test_name: 'longevity_lwt_test.LWTLongevityTest.test_lwt_longevity', - test_config: '''["test-cases/longevity/longevity-lwt-24h-multidc.yaml", "configurations/raft/enable_raft_experimental.yaml"]''' + test_config: '''["test-cases/longevity/longevity-lwt-24h-multidc.yaml"]''' ) diff --git a/jenkins-pipelines/oss/raft/longevity-lwt-500G-3d.jenkinsfile b/jenkins-pipelines/oss/raft/longevity-lwt-500G-3d.jenkinsfile index 7c3b885721..dd71a94407 100644 --- a/jenkins-pipelines/oss/raft/longevity-lwt-500G-3d.jenkinsfile +++ b/jenkins-pipelines/oss/raft/longevity-lwt-500G-3d.jenkinsfile @@ -7,6 +7,6 @@ longevityPipeline( backend: 'aws', region: 'eu-west-1', test_name: 'longevity_lwt_test.LWTLongevityTest.test_lwt_longevity', - test_config: '''["test-cases/longevity/longevity-lwt-500G-3d.yaml", "configurations/raft/enable_raft_experimental.yaml"]''' + test_config: '''["test-cases/longevity/longevity-lwt-500G-3d.yaml"]''' ) diff --git a/jenkins-pipelines/oss/raft/longevity-lwt-parallel-schema-changes-with-disruptive-24h-raft.jenkinsfile b/jenkins-pipelines/oss/raft/longevity-lwt-parallel-schema-changes-with-disruptive-24h-raft.jenkinsfile index 5abc121b45..5f4488302c 100644 --- a/jenkins-pipelines/oss/raft/longevity-lwt-parallel-schema-changes-with-disruptive-24h-raft.jenkinsfile +++ b/jenkins-pipelines/oss/raft/longevity-lwt-parallel-schema-changes-with-disruptive-24h-raft.jenkinsfile @@ -7,6 +7,6 @@ longevityPipeline( backend: 'aws', region: 'eu-west-1', test_name: 'longevity_lwt_test.LWTLongevityTest.test_lwt_longevity', - test_config: '''["test-cases/longevity/longevity-lwt-parallel-24h.yaml", "configurations/raft/enable_raft_experimental.yaml"]''' + test_config: '''["test-cases/longevity/longevity-lwt-parallel-24h.yaml"]''' ) diff --git a/jenkins-pipelines/oss/raft/longevity-schema-changes-3h-with-raft.jenkinsfile b/jenkins-pipelines/oss/raft/longevity-schema-changes-3h-with-raft.jenkinsfile index a26038b0a4..7b3ae189ed 100644 --- a/jenkins-pipelines/oss/raft/longevity-schema-changes-3h-with-raft.jenkinsfile +++ b/jenkins-pipelines/oss/raft/longevity-schema-changes-3h-with-raft.jenkinsfile @@ -7,7 +7,7 @@ longevityPipeline( backend: 'aws', region: 'eu-west-1', test_name: 'longevity_test.LongevityTest.test_custom_time', - test_config: '''["test-cases/longevity/longevity-schema-changes-3h.yaml", "configurations/raft/enable_raft_experimental.yaml"]''', + test_config: '''["test-cases/longevity/longevity-schema-changes-3h.yaml"]''', timeout: [time: 360, unit: 'MINUTES'] ) diff --git a/jenkins-pipelines/oss/raft/scale-40-60-cluster-test.jenkinsfile b/jenkins-pipelines/oss/raft/scale-40-60-cluster-test.jenkinsfile index ffa3c15a75..ddffee5145 100644 --- a/jenkins-pipelines/oss/raft/scale-40-60-cluster-test.jenkinsfile +++ b/jenkins-pipelines/oss/raft/scale-40-60-cluster-test.jenkinsfile @@ -8,7 +8,7 @@ longevityPipeline( region: 'eu-west-1', post_behavior_db_nodes: 'destroy', test_name: 'grow_cluster_test.GrowClusterTest.test_grow_x_to_y', - test_config: '''["test-cases/scale/scale-cluster.yaml", "configurations/scale/scale-40-60.yaml", "configurations/raft/enable_raft_experimental.yaml"]''', + test_config: '''["test-cases/scale/scale-cluster.yaml", "configurations/scale/scale-40-60.yaml"]''', timeout: [time: 12240, unit: 'MINUTES'] ) diff --git a/jenkins-pipelines/oss/tablets/longevity-100gb-4h.jenkinsfile b/jenkins-pipelines/oss/tablets/longevity-100gb-4h.jenkinsfile index 46a0bf1df7..72bd56d2ea 100644 --- a/jenkins-pipelines/oss/tablets/longevity-100gb-4h.jenkinsfile +++ b/jenkins-pipelines/oss/tablets/longevity-100gb-4h.jenkinsfile @@ -8,6 +8,6 @@ longevityPipeline( region: 'eu-west-1', availability_zone: 'c', test_name: 'longevity_test.LongevityTest.test_custom_time', - test_config: '''["test-cases/longevity/longevity-100gb-4h.yaml", "configurations/tablets.yaml", "configurations/tablets_supported_nemeses.yaml"]''', + test_config: '''["test-cases/longevity/longevity-100gb-4h.yaml", "configurations/tablets_supported_nemeses.yaml"]''', instance_provision_fallback_on_demand: true ) diff --git a/jenkins-pipelines/oss/tablets/longevity-harry-2h.jenkinsfile b/jenkins-pipelines/oss/tablets/longevity-harry-2h.jenkinsfile index 9738fa5cf1..0bd1cd6335 100644 --- a/jenkins-pipelines/oss/tablets/longevity-harry-2h.jenkinsfile +++ b/jenkins-pipelines/oss/tablets/longevity-harry-2h.jenkinsfile @@ -7,6 +7,6 @@ longevityPipeline( backend: 'aws', region: 'eu-west-1', test_name: 'longevity_test.LongevityTest.test_custom_time', - test_config: '''["test-cases/longevity/longevity-harry-2h.yaml", "configurations/tablets.yaml", "configurations/tablets_supported_nemeses.yaml"]''' + test_config: '''["test-cases/longevity/longevity-harry-2h.yaml", "configurations/tablets_supported_nemeses.yaml"]''' ) diff --git a/jenkins-pipelines/oss/tablets/longevity-large-partition-8h.jenkinsfile b/jenkins-pipelines/oss/tablets/longevity-large-partition-8h.jenkinsfile index c54a010ae6..f7a0f556ea 100644 --- a/jenkins-pipelines/oss/tablets/longevity-large-partition-8h.jenkinsfile +++ b/jenkins-pipelines/oss/tablets/longevity-large-partition-8h.jenkinsfile @@ -7,6 +7,6 @@ longevityPipeline( backend: 'aws', region: 'eu-west-1', test_name: 'longevity_large_partition_test.LargePartitionLongevityTest.test_large_partition_longevity', - test_config: '''["test-cases/longevity/longevity-large-partition-8h.yaml", "configurations/tablets.yaml", "configurations/tablets_supported_nemeses.yaml"]''' + test_config: '''["test-cases/longevity/longevity-large-partition-8h.yaml", "configurations/tablets_supported_nemeses.yaml"]''' ) diff --git a/jenkins-pipelines/oss/tablets/longevity-multi-keyspaces-60h.jenkinsfile b/jenkins-pipelines/oss/tablets/longevity-multi-keyspaces-60h.jenkinsfile index b25a1284b9..88d96cc510 100644 --- a/jenkins-pipelines/oss/tablets/longevity-multi-keyspaces-60h.jenkinsfile +++ b/jenkins-pipelines/oss/tablets/longevity-multi-keyspaces-60h.jenkinsfile @@ -7,5 +7,5 @@ longevityPipeline( backend: 'aws', region: 'eu-west-1', test_name: 'longevity_test.LongevityTest.test_batch_custom_time', - test_config: '''["test-cases/longevity/longevity-multi-keyspaces.yaml", "configurations/tablets.yaml", "configurations/tablets_supported_nemeses.yaml"]''' + test_config: '''["test-cases/longevity/longevity-multi-keyspaces.yaml", "configurations/tablets_supported_nemeses.yaml"]''' ) diff --git a/jenkins-pipelines/oss/tablets/longevity-multidc-multirack.jenkinsfile b/jenkins-pipelines/oss/tablets/longevity-multidc-multirack.jenkinsfile index ece61c40ae..4cc80aa414 100644 --- a/jenkins-pipelines/oss/tablets/longevity-multidc-multirack.jenkinsfile +++ b/jenkins-pipelines/oss/tablets/longevity-multidc-multirack.jenkinsfile @@ -7,6 +7,6 @@ longevityPipeline( backend: 'aws', region: '''["eu-west-1", "eu-west-2"]''', test_name: 'longevity_large_partition_test.LargePartitionLongevityTest.test_large_partition_longevity', - test_config: '''["test-cases/longevity/longevity-multi-dc-rack-aware.yaml", "configurations/tablets.yaml", "configurations/tablets_supported_nemeses.yaml", "configurations/tablets_multidc_multirack.yaml"]''' + test_config: '''["test-cases/longevity/longevity-multi-dc-rack-aware.yaml", "configurations/tablets_supported_nemeses.yaml", "configurations/tablets_multidc_multirack.yaml"]''' ) diff --git a/jenkins-pipelines/oss/tablets/scale-5000-tables.jenkinsfile b/jenkins-pipelines/oss/tablets/scale-5000-tables.jenkinsfile index 609def84a3..57e705e157 100644 --- a/jenkins-pipelines/oss/tablets/scale-5000-tables.jenkinsfile +++ b/jenkins-pipelines/oss/tablets/scale-5000-tables.jenkinsfile @@ -7,5 +7,5 @@ longevityPipeline( backend: 'aws', region: 'eu-west-1', test_name: 'longevity_test.LongevityTest.test_user_batch_custom_time', - test_config: '''["test-cases/scale/longevity-5000-tables.yaml", "configurations/tablets.yaml", "configurations/tablets_supported_nemeses.yaml"]''' + test_config: '''["test-cases/scale/longevity-5000-tables.yaml", "configurations/tablets_supported_nemeses.yaml"]''' ) diff --git a/sct.py b/sct.py index 3a9d50a7a4..bae6e2d535 100755 --- a/sct.py +++ b/sct.py @@ -1686,10 +1686,10 @@ def configure_jenkins_builders(cloud_provider, regions): def get_nemesis_list(backend, config): """ # usage via command line: - hydra nemesis-list -c test-cases/longevity/longevity-cdc-100gb-4h.yaml -c configurations/tablets.yaml + hydra nemesis-list -c test-cases/longevity/longevity-cdc-100gb-4h.yaml # usage with environment variables - export SCT_CONFIG_FILES='["test-cases/longevity/longevity-cdc-100gb-4h.yaml", "configurations/tablets.yaml"]' + export SCT_CONFIG_FILES='["test-cases/longevity/longevity-cdc-100gb-4h.yaml"]' hydra nemesis-list """ diff --git a/sdcm/sct_config.py b/sdcm/sct_config.py index 54f4a487e2..dffe33c9be 100644 --- a/sdcm/sct_config.py +++ b/sdcm/sct_config.py @@ -1173,10 +1173,6 @@ class SCTConfiguration(dict): "to still run [upgrade] test without raft enabled (or disabling raft), so we will have better" "coverage"), - dict(name="enable_tablets_on_upgrade", env="SCT_ENABLE_TABLETS_ON_UPGRADE", type=boolean, - help="By default, the tablets feature is disabled. With this parameter, created for the upgrade test," - "the tablets feature will only be enabled after the upgrade"), - dict(name="upgrade_node_packages", env="SCT_UPGRADE_NODE_PACKAGES", type=str, help=""), diff --git a/upgrade_test.py b/upgrade_test.py index c5e1f6740f..99f926ac74 100644 --- a/upgrade_test.py +++ b/upgrade_test.py @@ -205,9 +205,6 @@ def _upgrade_node(self, node, upgrade_sstables=True, new_scylla_repo=None, new_v if not self.params.get('disable_raft'): scylla_yaml_updates.update({"consistent_cluster_management": True}) - if self.params.get("enable_tablets_on_upgrade"): - scylla_yaml_updates.update({"experimental_features": ["tablets", "consistent-topology-changes"]}) - if self.params.get('test_sst3'): scylla_yaml_updates.update({"enable_sstables_mc_format": True}) @@ -371,15 +368,6 @@ def _rollback_node(self, node, upgrade_sstables=True): node.run_nodetool("snapshot") node.stop_scylla_server(verify_down=False) - if self.params.get("enable_tablets_on_upgrade"): - with node.remote_scylla_yaml() as scylla_yml: - current_experimental_features = scylla_yml.experimental_features - current_experimental_features.remove("tablets") - current_experimental_features.remove("consistent-topology-changes") - if len(current_experimental_features) == 0: - current_experimental_features = None - scylla_yml.experimental_features = current_experimental_features - if node.distro.is_rhel_like: node.remoter.run('sudo cp ~/scylla.repo-backup /etc/yum.repos.d/scylla.repo') node.remoter.run('sudo chown root.root /etc/yum.repos.d/scylla.repo')