From 2b476ee1ded87886da774e32a157cb41c489b968 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. --- .../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 ++-- .../manager/manager-sanity.jenkinsfile | 4 ++-- ...-enterprise-ami-manager-sanity.jenkinsfile | 2 +- .../ubuntu20-manager-sanity.jenkinsfile | 4 ++-- .../ubuntu22-manager-sanity.jenkinsfile | 4 ++-- ...anager-regression-singleDC-set-distro.yaml | 21 +++++++++++++++++++ 10 files changed, 38 insertions(+), 17 deletions(-) create mode 100644 test-cases/manager/manager-regression-singleDC-set-distro.yaml diff --git a/jenkins-pipelines/manager/centos-manager-backup-200gb.jenkinsfile b/jenkins-pipelines/manager/centos-manager-backup-200gb.jenkinsfile index 160ad9716f9..16af532582e 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 2a85e38688e..d246c91584b 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 18854bb1f87..68f61e827e1 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 a8090b9a7e7..db29f920aec 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 56013aa2305..7156b5a6b7f 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/manager-sanity.jenkinsfile b/jenkins-pipelines/manager/manager-sanity.jenkinsfile index f8c2795c767..c4d3c6d9dd0 100644 --- a/jenkins-pipelines/manager/manager-sanity.jenkinsfile +++ b/jenkins-pipelines/manager/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/older-enterprise-ami-manager-sanity.jenkinsfile b/jenkins-pipelines/manager/older-enterprise-ami-manager-sanity.jenkinsfile index 6a48afe88a3..0f2f37579f8 100644 --- a/jenkins-pipelines/manager/older-enterprise-ami-manager-sanity.jenkinsfile +++ b/jenkins-pipelines/manager/older-enterprise-ami-manager-sanity.jenkinsfile @@ -5,7 +5,7 @@ def lib = library identifier: 'sct@snapshot', retriever: legacySCM(scm) managerPipeline( backend: 'aws', - region: '''["us-east-1", "us-west-2"]''', + region: 'us-east-1', scylla_version: '2022.1', diff --git a/jenkins-pipelines/manager/ubuntu20-manager-sanity.jenkinsfile b/jenkins-pipelines/manager/ubuntu20-manager-sanity.jenkinsfile index 86c40ca3133..bc485120923 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 35c30b0c174..9b035933de3 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 00000000000..ef8a6d35537 --- /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'