Skip to content

Commit 9940b54

Browse files
mikliapkoroydahan
authored andcommitted
fix(manager): make 3.5.0 a default version of Manager
As the new minor release of Manager - 3.5.0 - is here, it is set to be a default one used in tests. Together with that, Scylla 2025.1 is added to manager_versions.yaml config and will be the default one to test with Manager 3.5.0. test_sdcm_mgmt_common.py tests have been updated accordingly.
1 parent c4927fb commit 9940b54

File tree

5 files changed

+21
-21
lines changed

5 files changed

+21
-21
lines changed

Diff for: defaults/manager_versions.yaml

+9-9
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@ manager_repos_by_version:
22
"master_latest":
33
rhel: 'https://downloads.scylladb.com/manager/rpm/unstable/centos/master/latest/scylla-manager.repo'
44
debian: 'https://downloads.scylladb.com/manager/deb/unstable/unified-deb/master/latest/scylla-manager.list'
5+
"3.5":
6+
rhel: 'https://downloads.scylladb.com/rpm/centos/scylladb-manager-3.5.repo'
7+
debian: 'https://downloads.scylladb.com/deb/debian/scylladb-manager-3.5.list'
58
"3.4":
69
rhel: 'https://downloads.scylladb.com/rpm/centos/scylladb-manager-3.4.repo'
710
debian: 'https://downloads.scylladb.com/deb/debian/scylladb-manager-3.4.list'
811
"3.3":
912
rhel: 'https://downloads.scylladb.com/rpm/centos/scylladb-manager-3.3.repo'
1013
debian: 'https://downloads.scylladb.com/deb/debian/scylladb-manager-3.3.list'
11-
"3.2":
12-
rhel: 'https://downloads.scylladb.com/rpm/centos/scylladb-manager-3.2.repo'
13-
debian: 'https://downloads.scylladb.com/deb/debian/scylladb-manager-3.2.list'
1414

1515
scylla_backend_repo_by_version:
16-
"2022":
17-
rhel: 'https://downloads.scylladb.com/rpm/centos/scylla-2022.1.repo'
18-
debian: 'https://downloads.scylladb.com/deb/debian/scylla-2022.1.list'
19-
"2023":
20-
rhel: 'https://downloads.scylladb.com/rpm/centos/scylla-2023.1.repo'
21-
debian: 'https://downloads.scylladb.com/deb/debian/scylla-2023.1.list'
16+
"2025":
17+
rhel: 'https://downloads.scylladb.com/rpm/centos/scylla-2025.1.repo'
18+
debian: 'https://downloads.scylladb.com/deb/debian/scylla-2025.1.list'
2219
"2024":
2320
rhel: 'https://downloads.scylladb.com/rpm/centos/scylla-2024.2.repo'
2421
debian: 'https://downloads.scylladb.com/deb/debian/scylla-2024.2.list'
22+
"2023":
23+
rhel: 'https://downloads.scylladb.com/rpm/centos/scylla-2023.1.repo'
24+
debian: 'https://downloads.scylladb.com/deb/debian/scylla-2023.1.list'

Diff for: defaults/test_default.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ip_ssh_connections: 'private'
88

99
scylla_repo: ''
1010

11-
manager_version: '3.4'
11+
manager_version: '3.5'
1212
manager_scylla_backend_version: '2024'
1313
# Notice: that centos (default monitor), ubuntu 22, ubuntu 20 and debian 11 monitors use 2024, while debian 10 ubuntu 18 use 2023, since we support both
1414

@@ -160,8 +160,8 @@ jepsen_test_count: 1
160160
jepsen_test_run_policy: all
161161

162162
max_events_severities: ""
163-
scylla_mgmt_agent_version: '3.4.0'
164-
mgmt_docker_image: 'scylladb/scylla-manager:3.4.0'
163+
scylla_mgmt_agent_version: '3.5.0'
164+
mgmt_docker_image: 'scylladb/scylla-manager:3.5.0'
165165
k8s_log_api_calls: false
166166
k8s_deploy_monitoring: false
167167
k8s_minio_storage_size: '10Gi'

Diff for: docs/configuration_options.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ Url to the repo of scylla manager agent version to install for management tests
325325

326326
Branch of scylla manager server and agent to install. Options in defaults/manager_versions.yaml
327327

328-
**default:** 3.4
328+
**default:** 3.5
329329

330330
**type:** str
331331

@@ -352,7 +352,7 @@ Branch of scylla db enterprise to install. Options in defaults/manager_versions.
352352

353353

354354

355-
**default:** 3.4.0
355+
**default:** 3.5.0
356356

357357
**type:** str
358358

@@ -2044,7 +2044,7 @@ Number of nodes in monitoring pool that will be used for scylla-operator's deplo
20442044

20452045
Scylla manager docker image, i.e. 'scylladb/scylla-manager:2.2.1'
20462046

2047-
**default:** scylladb/scylla-manager:3.4.0
2047+
**default:** scylladb/scylla-manager:3.5.0
20482048

20492049
**type:** str (appendable)
20502050

Diff for: unit_tests/test_sdcm_mgmt_common.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
class TestManagerVersions:
66

77
def test_get_manager_scylla_backend_returns_repo_address(self): # pylint: disable=no-self-use
8-
url = get_manager_scylla_backend("2024", Distro.UBUNTU22)
8+
url = get_manager_scylla_backend("2025", Distro.UBUNTU22)
99

10-
assert url == 'https://downloads.scylladb.com/deb/debian/scylla-2024.2.list'
10+
assert url == 'https://downloads.scylladb.com/deb/debian/scylla-2025.1.list'
1111

1212
def test_get_manager_repo_from_defaults_returns_repo_address(self): # pylint: disable=no-self-use
13-
url = get_manager_repo_from_defaults("3.2", Distro.UBUNTU22)
13+
url = get_manager_repo_from_defaults("3.5", Distro.UBUNTU22)
1414

15-
assert url == 'https://downloads.scylladb.com/deb/debian/scylladb-manager-3.2.list'
15+
assert url == 'https://downloads.scylladb.com/deb/debian/scylladb-manager-3.5.list'

Diff for: vars/managerPipeline.groovy

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def call(Map pipelineParams) {
7676

7777

7878
string(defaultValue: '', description: '', name: 'scylla_ami_id')
79-
string(defaultValue: "${pipelineParams.get('scylla_version', '2024.2')}", description: '', name: 'scylla_version')
79+
string(defaultValue: "${pipelineParams.get('scylla_version', '2025.1')}", description: '', name: 'scylla_version')
8080
// When branching to manager version branch, set scylla_version to the latest release
8181
string(defaultValue: '', description: '', name: 'scylla_repo')
8282
string(defaultValue: "${pipelineParams.get('gce_image_db', '')}",
@@ -107,7 +107,7 @@ def call(Map pipelineParams) {
107107
name: 'ip_ssh_connections')
108108

109109
string(defaultValue: "${pipelineParams.get('manager_version', 'master_latest')}",
110-
description: 'master_latest|3.4|3.3',
110+
description: 'master_latest|3.5|3.4',
111111
name: 'manager_version')
112112

113113
string(defaultValue: "${pipelineParams.get('scylla_mgmt_address', '')}",

0 commit comments

Comments
 (0)