From 9912e13fde1a8b5a9a226dfe915c931c19d1fc23 Mon Sep 17 00:00:00 2001 From: Liapkovich Date: Fri, 27 Dec 2024 11:35:15 +0100 Subject: [PATCH] fix(manager): update default Scylla version to 2024.2 for Manager tests Default scylla_version is set to 2024.2 instead of 2024.1. At the same time, to have some coverage for 2024.1 as well, all Debian11 jobs adjusted to use version 2024.1. Related test_get_manager_scylla_backend_returns_repo_address test is adjusted too. --- defaults/manager_versions.yaml | 4 ++-- .../manager/debian11-manager-install.jenkinsfile | 2 ++ jenkins-pipelines/manager/debian11-manager-sanity.jenkinsfile | 2 ++ .../manager/debian11-manager-upgrade.jenkinsfile | 3 ++- .../ubuntu22-manager-vnodes-tablets-enterprise.jenkinsfile | 2 -- unit_tests/test_sdcm_mgmt_common.py | 2 +- vars/managerPipeline.groovy | 2 +- 7 files changed, 10 insertions(+), 7 deletions(-) diff --git a/defaults/manager_versions.yaml b/defaults/manager_versions.yaml index 8864fc4b10..4a951f6abc 100644 --- a/defaults/manager_versions.yaml +++ b/defaults/manager_versions.yaml @@ -20,5 +20,5 @@ scylla_backend_repo_by_version: rhel: 'https://downloads.scylladb.com/rpm/centos/scylla-2023.1.repo' debian: 'https://downloads.scylladb.com/deb/debian/scylla-2023.1.list' "2024": - rhel: 'https://downloads.scylladb.com/rpm/centos/scylla-2024.1.repo' - debian: 'https://downloads.scylladb.com/deb/debian/scylla-2024.1.list' + rhel: 'https://downloads.scylladb.com/rpm/centos/scylla-2024.2.repo' + debian: 'https://downloads.scylladb.com/deb/debian/scylla-2024.2.list' diff --git a/jenkins-pipelines/manager/debian11-manager-install.jenkinsfile b/jenkins-pipelines/manager/debian11-manager-install.jenkinsfile index 19a70f15da..ab4566c4f3 100644 --- a/jenkins-pipelines/manager/debian11-manager-install.jenkinsfile +++ b/jenkins-pipelines/manager/debian11-manager-install.jenkinsfile @@ -9,6 +9,8 @@ managerPipeline( test_name: 'mgmt_cli_test.ManagerInstallationTests.test_manager_installed_and_functional', test_config: '''["test-cases/manager/manager-installation-set-distro.yaml", "configurations/manager/debian11.yaml"]''', + scylla_version: '2024.1', + post_behavior_db_nodes: 'destroy', post_behavior_loader_nodes: 'destroy', post_behavior_monitor_nodes: 'destroy', diff --git a/jenkins-pipelines/manager/debian11-manager-sanity.jenkinsfile b/jenkins-pipelines/manager/debian11-manager-sanity.jenkinsfile index 293ae3dc9a..f5ca7b7fed 100644 --- a/jenkins-pipelines/manager/debian11-manager-sanity.jenkinsfile +++ b/jenkins-pipelines/manager/debian11-manager-sanity.jenkinsfile @@ -9,6 +9,8 @@ managerPipeline( test_name: 'mgmt_cli_test.ManagerSanityTests.test_manager_sanity', test_config: '''["test-cases/manager/manager-regression-singleDC-set-distro.yaml", "configurations/manager/debian11.yaml"]''', + scylla_version: '2024.1', + post_behavior_db_nodes: 'destroy', post_behavior_loader_nodes: 'destroy', post_behavior_monitor_nodes: 'destroy', diff --git a/jenkins-pipelines/manager/debian11-manager-upgrade.jenkinsfile b/jenkins-pipelines/manager/debian11-manager-upgrade.jenkinsfile index 67c32e0c06..2333e7a51a 100644 --- a/jenkins-pipelines/manager/debian11-manager-upgrade.jenkinsfile +++ b/jenkins-pipelines/manager/debian11-manager-upgrade.jenkinsfile @@ -7,9 +7,10 @@ managerPipeline( backend: 'aws', region: 'us-east-1', + manager_version: '3.3', target_manager_version: 'master_latest', - manager_version: '3.3', + scylla_version: '2024.1', test_name: 'mgmt_upgrade_test.ManagerUpgradeTest.test_upgrade', test_config: '''["test-cases/upgrades/manager-upgrade.yaml", "configurations/manager/debian11.yaml"]''', diff --git a/jenkins-pipelines/manager/ubuntu22-manager-vnodes-tablets-enterprise.jenkinsfile b/jenkins-pipelines/manager/ubuntu22-manager-vnodes-tablets-enterprise.jenkinsfile index 80f035ed62..cc8936e2cc 100644 --- a/jenkins-pipelines/manager/ubuntu22-manager-vnodes-tablets-enterprise.jenkinsfile +++ b/jenkins-pipelines/manager/ubuntu22-manager-vnodes-tablets-enterprise.jenkinsfile @@ -9,8 +9,6 @@ managerPipeline( test_name: 'mgmt_cli_test.ManagerSanityTests.test_manager_sanity_vnodes_tablets_cluster', test_config: '''["test-cases/manager/manager-regression-singleDC-set-distro.yaml", "configurations/tablets-initial-32.yaml"]''', - scylla_version: '2024.2', - post_behavior_db_nodes: 'destroy', post_behavior_loader_nodes: 'destroy', post_behavior_monitor_nodes: 'destroy', diff --git a/unit_tests/test_sdcm_mgmt_common.py b/unit_tests/test_sdcm_mgmt_common.py index 5d2252dd50..273bec573e 100644 --- a/unit_tests/test_sdcm_mgmt_common.py +++ b/unit_tests/test_sdcm_mgmt_common.py @@ -7,7 +7,7 @@ class TestManagerVersions: def test_get_manager_scylla_backend_returns_repo_address(self): # pylint: disable=no-self-use url = get_manager_scylla_backend("2024", Distro.UBUNTU22) - assert url == 'https://downloads.scylladb.com/deb/debian/scylla-2024.1.list' + assert url == 'https://downloads.scylladb.com/deb/debian/scylla-2024.2.list' def test_get_manager_repo_from_defaults_returns_repo_address(self): # pylint: disable=no-self-use url = get_manager_repo_from_defaults("3.2", Distro.UBUNTU22) diff --git a/vars/managerPipeline.groovy b/vars/managerPipeline.groovy index 06eddaed2e..629b57653d 100644 --- a/vars/managerPipeline.groovy +++ b/vars/managerPipeline.groovy @@ -76,7 +76,7 @@ def call(Map pipelineParams) { string(defaultValue: '', description: '', name: 'scylla_ami_id') - string(defaultValue: "${pipelineParams.get('scylla_version', '2024.1')}", description: '', name: 'scylla_version') + string(defaultValue: "${pipelineParams.get('scylla_version', '2024.2')}", description: '', name: 'scylla_version') // When branching to manager version branch, set scylla_version to the latest release string(defaultValue: '', description: '', name: 'scylla_repo') string(defaultValue: "${pipelineParams.get('gce_image_db', '')}",