From e1b7f34a2249b06f972da8ddb85f05d6eb09e974 Mon Sep 17 00:00:00 2001 From: Liapkovich Date: Tue, 15 Oct 2024 14:18:04 +0200 Subject: [PATCH] fix(manager): switch sanity tests to run on multiDC cluster Sanity tests on debian11, ubuntu22 and ubuntu24 switched to be run on multiDC cluster. This configuration was already in place some time ago before issue https://github.com/scylladb/scylla-manager/issues/3871 was found. After that Manager jobs were switched to run only on singleDC cluster (https://github.com/scylladb/scylla-cluster-tests/pull/7435). And since the fix for Manager is ready now, multiDC setup can be brought back. --- jenkins-pipelines/manager/debian11-manager-sanity.jenkinsfile | 4 ++-- jenkins-pipelines/manager/ubuntu22-manager-sanity.jenkinsfile | 4 ++-- jenkins-pipelines/manager/ubuntu24-manager-sanity.jenkinsfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jenkins-pipelines/manager/debian11-manager-sanity.jenkinsfile b/jenkins-pipelines/manager/debian11-manager-sanity.jenkinsfile index 8df9dfd48d..011a1192f3 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', + region: '''["us-east-1", "us-west-2"]''', test_name: 'mgmt_cli_test.MgmtCliTest.test_manager_sanity', - test_config: '''["test-cases/manager/manager-regression-singleDC-set-distro.yaml", "configurations/manager/debian11.yaml"]''', + test_config: '''["test-cases/manager/manager-regression-multiDC-set-distro.yaml", "configurations/manager/debian11.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 9b035933de..fb697db356 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', + region: '''["us-east-1", "us-west-2"]''', test_name: 'mgmt_cli_test.MgmtCliTest.test_manager_sanity', - test_config: 'test-cases/manager/manager-regression-singleDC-set-distro.yaml', + test_config: 'test-cases/manager/manager-regression-multiDC-set-distro.yaml', post_behavior_db_nodes: 'destroy', post_behavior_loader_nodes: 'destroy', diff --git a/jenkins-pipelines/manager/ubuntu24-manager-sanity.jenkinsfile b/jenkins-pipelines/manager/ubuntu24-manager-sanity.jenkinsfile index d33bd5039f..efde9ac3e5 100644 --- a/jenkins-pipelines/manager/ubuntu24-manager-sanity.jenkinsfile +++ b/jenkins-pipelines/manager/ubuntu24-manager-sanity.jenkinsfile @@ -5,9 +5,9 @@ def lib = library identifier: 'sct@snapshot', retriever: legacySCM(scm) managerPipeline( backend: 'aws', - region: 'us-east-1', + region: '''["us-east-1", "us-west-2"]''', test_name: 'mgmt_cli_test.MgmtCliTest.test_manager_sanity', - test_config: '''["test-cases/manager/manager-regression-singleDC-set-distro.yaml", "configurations/manager/ubuntu24.yaml"]''', + test_config: '''["test-cases/manager/manager-regression-multiDC-set-distro.yaml", "configurations/manager/ubuntu24.yaml"]''', post_behavior_db_nodes: 'destroy', post_behavior_loader_nodes: 'destroy',