From 11e0fb7b622ab1befc263a786ac3e763aec6da83 Mon Sep 17 00:00:00 2001 From: Liapkovich Date: Wed, 6 Nov 2024 10:42:47 +0100 Subject: [PATCH] ci(manager): upgrade jenkinsfiles with relevant scylla versions Changes: - Older enterprise tests switched to run with 2023.1 instead of 2022.2 - Test with tablets switched to use the latest OSS version 6.2 --- .../ubuntu22-manager-older-enterprise-sanity.jenkinsfile | 2 +- .../ubuntu22-manager-older-enterprise-upgrade.jenkinsfile | 2 +- .../manager/ubuntu22-manager-vnodes-tablets.jenkinsfile | 2 +- vars/managerPipeline.groovy | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jenkins-pipelines/manager/ubuntu22-manager-older-enterprise-sanity.jenkinsfile b/jenkins-pipelines/manager/ubuntu22-manager-older-enterprise-sanity.jenkinsfile index b42ef36858..9326daa210 100644 --- a/jenkins-pipelines/manager/ubuntu22-manager-older-enterprise-sanity.jenkinsfile +++ b/jenkins-pipelines/manager/ubuntu22-manager-older-enterprise-sanity.jenkinsfile @@ -7,7 +7,7 @@ managerPipeline( backend: 'aws', region: '''["us-east-1", "us-west-2"]''', - scylla_version: '2022.2', + scylla_version: '2023.1', test_name: 'mgmt_cli_test.MgmtCliTest.test_manager_sanity', test_config: 'test-cases/manager/manager-regression-multiDC-set-distro.yaml', diff --git a/jenkins-pipelines/manager/ubuntu22-manager-older-enterprise-upgrade.jenkinsfile b/jenkins-pipelines/manager/ubuntu22-manager-older-enterprise-upgrade.jenkinsfile index 91039f60c1..4b3921e31a 100644 --- a/jenkins-pipelines/manager/ubuntu22-manager-older-enterprise-upgrade.jenkinsfile +++ b/jenkins-pipelines/manager/ubuntu22-manager-older-enterprise-upgrade.jenkinsfile @@ -7,7 +7,7 @@ managerPipeline( backend: 'aws', region: 'us-east-1', - scylla_version: '2022.2', + scylla_version: '2023.1', target_manager_version: 'master_latest', diff --git a/jenkins-pipelines/manager/ubuntu22-manager-vnodes-tablets.jenkinsfile b/jenkins-pipelines/manager/ubuntu22-manager-vnodes-tablets.jenkinsfile index 67cd9f8b07..f2c9a4c83d 100644 --- a/jenkins-pipelines/manager/ubuntu22-manager-vnodes-tablets.jenkinsfile +++ b/jenkins-pipelines/manager/ubuntu22-manager-vnodes-tablets.jenkinsfile @@ -9,7 +9,7 @@ managerPipeline( test_name: 'mgmt_cli_test.MgmtCliTest.test_manager_sanity_vnodes_tablets_cluster', test_config: 'test-cases/manager/manager-regression-singleDC-set-distro.yaml', - scylla_version: '6.0', + scylla_version: '6.2', post_behavior_db_nodes: 'destroy', post_behavior_loader_nodes: 'destroy', diff --git a/vars/managerPipeline.groovy b/vars/managerPipeline.groovy index 8dd7d18752..7c92daf212 100644 --- a/vars/managerPipeline.groovy +++ b/vars/managerPipeline.groovy @@ -107,7 +107,7 @@ def call(Map pipelineParams) { name: 'ip_ssh_connections') string(defaultValue: "${pipelineParams.get('manager_version', 'master_latest')}", - description: 'master_latest|3.2|3.1', + description: 'master_latest|3.4|3.3', name: 'manager_version') string(defaultValue: "${pipelineParams.get('scylla_mgmt_address', '')}", @@ -123,7 +123,7 @@ def call(Map pipelineParams) { name: 'scylla_mgmt_pkg') string(defaultValue: "${pipelineParams.get('target_manager_version', '')}", - description: 'master_latest|3.2|3.1. Only for upgrade test', + description: 'master_latest|3.4|3.3. Only for upgrade test', name: 'target_manager_version') string(defaultValue: "${pipelineParams.get('target_scylla_mgmt_server_address', '')}",