From efc669df62c7f61de1557f84018a2f6a441b7cce Mon Sep 17 00:00:00 2001 From: Liapkovich Date: Tue, 14 May 2024 14:43:42 +0200 Subject: [PATCH] fix(manager): switch manager tests to use singleDC cluster Since there is an issue with multiDC cluster restore when the EaR is turned on (https://github.com/scylladb/scylla-manager/issues/3829), it was decided to temporarily switch the main part of jobs to run on singleDC cluster. Only one multiDC cluster job is left for enterprise version 2022 where EaR is not implemented. (cherry picked from commit 4da831db1d2268314c08c253d5b1e13d12c8aa46) --- jenkins-pipelines/manager-sanity.jenkinsfile | 4 ++-- .../centos-manager-backup-200gb.jenkinsfile | 4 ++-- .../manager/centos-manager-backup.jenkinsfile | 4 ++-- .../manager/centos-manager-sanity.jenkinsfile | 4 ++-- .../debian10-manager-sanity.jenkinsfile | 4 ++-- .../debian11-manager-sanity.jenkinsfile | 4 ++-- .../ubuntu20-manager-sanity.jenkinsfile | 4 ++-- .../ubuntu22-manager-sanity.jenkinsfile | 4 ++-- ...anager-regression-singleDC-set-distro.yaml | 21 +++++++++++++++++++ 9 files changed, 37 insertions(+), 16 deletions(-) create mode 100644 test-cases/manager/manager-regression-singleDC-set-distro.yaml diff --git a/jenkins-pipelines/manager-sanity.jenkinsfile b/jenkins-pipelines/manager-sanity.jenkinsfile index f8c2795c76..c4d3c6d9dd 100644 --- a/jenkins-pipelines/manager-sanity.jenkinsfile +++ b/jenkins-pipelines/manager-sanity.jenkinsfile @@ -5,9 +5,9 @@ def lib = library identifier: 'sct@snapshot', retriever: legacySCM(scm) managerPipeline( backend: 'aws', - region: '''["us-east-1", "us-west-2"]''', + region: 'us-east-1', test_name: 'mgmt_cli_test.MgmtCliTest.test_manager_sanity', - test_config: 'test-cases/manager/manager-regression-multiDC-set-distro.yaml', + test_config: 'test-cases/manager/manager-regression-singleDC-set-distro.yaml', timeout: [time: 500, unit: 'MINUTES'], post_behavior_db_nodes: 'destroy', diff --git a/jenkins-pipelines/manager/centos-manager-backup-200gb.jenkinsfile b/jenkins-pipelines/manager/centos-manager-backup-200gb.jenkinsfile index 160ad9716f..16af532582 100644 --- a/jenkins-pipelines/manager/centos-manager-backup-200gb.jenkinsfile +++ b/jenkins-pipelines/manager/centos-manager-backup-200gb.jenkinsfile @@ -5,9 +5,9 @@ def lib = library identifier: 'sct@snapshot', retriever: legacySCM(scm) managerPipeline( backend: 'aws', - region: '''["us-east-1", "us-west-2"]''', + region: 'us-west-2', test_name: 'mgmt_cli_test.MgmtCliTest.test_backup_feature', - test_config: '''["test-cases/manager/manager-regression-multiDC-set-distro.yaml", "configurations/manager/200gb_dataset.yaml"]''', + test_config: '''["test-cases/manager/manager-regression-singleDC-set-distro.yaml", "configurations/manager/200gb_dataset.yaml"]''', post_behavior_db_nodes: 'destroy', post_behavior_loader_nodes: 'destroy', diff --git a/jenkins-pipelines/manager/centos-manager-backup.jenkinsfile b/jenkins-pipelines/manager/centos-manager-backup.jenkinsfile index 2a85e38688..d246c91584 100644 --- a/jenkins-pipelines/manager/centos-manager-backup.jenkinsfile +++ b/jenkins-pipelines/manager/centos-manager-backup.jenkinsfile @@ -5,9 +5,9 @@ def lib = library identifier: 'sct@snapshot', retriever: legacySCM(scm) managerPipeline( backend: 'aws', - region: '''["us-east-1", "us-west-2"]''', + region: 'us-west-2', test_name: 'mgmt_cli_test.MgmtCliTest.test_backup_feature', - test_config: 'test-cases/manager/manager-regression-multiDC-set-distro.yaml', + test_config: 'test-cases/manager/manager-regression-singleDC-set-distro.yaml', post_behavior_db_nodes: 'destroy', post_behavior_loader_nodes: 'destroy', diff --git a/jenkins-pipelines/manager/centos-manager-sanity.jenkinsfile b/jenkins-pipelines/manager/centos-manager-sanity.jenkinsfile index 18854bb1f8..68f61e827e 100644 --- a/jenkins-pipelines/manager/centos-manager-sanity.jenkinsfile +++ b/jenkins-pipelines/manager/centos-manager-sanity.jenkinsfile @@ -5,9 +5,9 @@ def lib = library identifier: 'sct@snapshot', retriever: legacySCM(scm) managerPipeline( backend: 'aws', - region: '''["us-east-1", "us-west-2"]''', + region: 'us-west-2', test_name: 'mgmt_cli_test.MgmtCliTest.test_manager_sanity', - test_config: 'test-cases/manager/manager-regression-multiDC-set-distro.yaml', + test_config: 'test-cases/manager/manager-regression-singleDC-set-distro.yaml', post_behavior_db_nodes: 'destroy', post_behavior_loader_nodes: 'destroy', diff --git a/jenkins-pipelines/manager/debian10-manager-sanity.jenkinsfile b/jenkins-pipelines/manager/debian10-manager-sanity.jenkinsfile index a8090b9a7e..db29f920ae 100644 --- a/jenkins-pipelines/manager/debian10-manager-sanity.jenkinsfile +++ b/jenkins-pipelines/manager/debian10-manager-sanity.jenkinsfile @@ -5,9 +5,9 @@ def lib = library identifier: 'sct@snapshot', retriever: legacySCM(scm) managerPipeline( backend: 'aws', - region: '''["us-east-1", "us-west-2"]''', + region: 'us-west-2', test_name: 'mgmt_cli_test.MgmtCliTest.test_manager_sanity', - test_config: '''["test-cases/manager/manager-regression-multiDC-set-distro.yaml", "configurations/manager/debian10.yaml"]''', + test_config: '''["test-cases/manager/manager-regression-singleDC-set-distro.yaml", "configurations/manager/debian10.yaml"]''', post_behavior_db_nodes: 'destroy', post_behavior_loader_nodes: 'destroy', diff --git a/jenkins-pipelines/manager/debian11-manager-sanity.jenkinsfile b/jenkins-pipelines/manager/debian11-manager-sanity.jenkinsfile index 56013aa230..7156b5a6b7 100644 --- a/jenkins-pipelines/manager/debian11-manager-sanity.jenkinsfile +++ b/jenkins-pipelines/manager/debian11-manager-sanity.jenkinsfile @@ -5,9 +5,9 @@ def lib = library identifier: 'sct@snapshot', retriever: legacySCM(scm) managerPipeline( backend: 'aws', - region: '''["us-east-1", "us-west-2"]''', + region: 'us-west-2', test_name: 'mgmt_cli_test.MgmtCliTest.test_manager_sanity', - test_config: '''["test-cases/manager/manager-regression-multiDC-set-distro.yaml", "configurations/manager/debian11.yaml"]''', + test_config: '''["test-cases/manager/manager-regression-singleDC-set-distro.yaml", "configurations/manager/debian11.yaml"]''', post_behavior_db_nodes: 'destroy', post_behavior_loader_nodes: 'destroy', diff --git a/jenkins-pipelines/manager/ubuntu20-manager-sanity.jenkinsfile b/jenkins-pipelines/manager/ubuntu20-manager-sanity.jenkinsfile index 86c40ca313..bc48512092 100644 --- a/jenkins-pipelines/manager/ubuntu20-manager-sanity.jenkinsfile +++ b/jenkins-pipelines/manager/ubuntu20-manager-sanity.jenkinsfile @@ -5,9 +5,9 @@ def lib = library identifier: 'sct@snapshot', retriever: legacySCM(scm) managerPipeline( backend: 'aws', - region: '''["us-east-1", "us-west-2"]''', + region: 'us-east-1', test_name: 'mgmt_cli_test.MgmtCliTest.test_manager_sanity', - test_config: '''["test-cases/manager/manager-regression-multiDC-set-distro.yaml", "configurations/manager/ubuntu20.yaml"]''', + test_config: '''["test-cases/manager/manager-regression-singleDC-set-distro.yaml", "configurations/manager/ubuntu20.yaml"]''', post_behavior_db_nodes: 'destroy', post_behavior_loader_nodes: 'destroy', diff --git a/jenkins-pipelines/manager/ubuntu22-manager-sanity.jenkinsfile b/jenkins-pipelines/manager/ubuntu22-manager-sanity.jenkinsfile index 35c30b0c17..9b035933de 100644 --- a/jenkins-pipelines/manager/ubuntu22-manager-sanity.jenkinsfile +++ b/jenkins-pipelines/manager/ubuntu22-manager-sanity.jenkinsfile @@ -5,9 +5,9 @@ def lib = library identifier: 'sct@snapshot', retriever: legacySCM(scm) managerPipeline( backend: 'aws', - region: '''["us-east-1", "us-west-2"]''', + region: 'us-east-1', test_name: 'mgmt_cli_test.MgmtCliTest.test_manager_sanity', - test_config: 'test-cases/manager/manager-regression-multiDC-set-distro.yaml', + test_config: 'test-cases/manager/manager-regression-singleDC-set-distro.yaml', post_behavior_db_nodes: 'destroy', post_behavior_loader_nodes: 'destroy', diff --git a/test-cases/manager/manager-regression-singleDC-set-distro.yaml b/test-cases/manager/manager-regression-singleDC-set-distro.yaml new file mode 100644 index 0000000000..ef8a6d3553 --- /dev/null +++ b/test-cases/manager/manager-regression-singleDC-set-distro.yaml @@ -0,0 +1,21 @@ +test_duration: 240 + +stress_cmd: "cassandra-stress write cl=QUORUM n=4000000 -schema 'replication(strategy=NetworkTopologyStrategy,replication_factor=3)' -mode cql3 native -rate threads=200 -pop seq=400000000..600000000" +stress_read_cmd: "cassandra-stress read cl=QUORUM n=4000000 -schema 'replication(strategy=NetworkTopologyStrategy,replication_factor=3)' -mode cql3 native -rate threads=200 -pop seq=400000000..600000000" + +instance_type_db: 'i4i.large' +instance_type_loader: 'c6i.large' + +region_name: 'us-east-1' +n_db_nodes: '3' +n_loaders: 1 +n_monitor_nodes: 1 + +post_behavior_db_nodes: "destroy" +post_behavior_loader_nodes: "destroy" +post_behavior_monitor_nodes: "destroy" + +user_prefix: manager-regression +space_node_threshold: 6442 + +aws_instance_profile_name_db: 'qa-scylla-manager-backup-instance-profile'