Skip to content

Manager 3.5.0 release updates #10586

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 7, 2025
Merged

Manager 3.5.0 release updates #10586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a953b3f
ci(manager): change the version to upgrade from to 3.4.*
mikliapko Apr 1, 2025
1497d23
ci(manager): cover Scylla 2024.1/2024.2 in some of the jobs
mikliapko Apr 2, 2025
77a7a99
fix(manager): make 3.5.0 a default version of Manager
mikliapko Apr 3, 2025
1abac5d
fix(manager): get rf dynamically for repair test with multiDC cluster
mikliapko Apr 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions defaults/manager_versions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@ manager_repos_by_version:
"master_latest":
rhel: 'https://downloads.scylladb.com/manager/rpm/unstable/centos/master/latest/scylla-manager.repo'
debian: 'https://downloads.scylladb.com/manager/deb/unstable/unified-deb/master/latest/scylla-manager.list'
"3.5":
rhel: 'https://downloads.scylladb.com/rpm/centos/scylladb-manager-3.5.repo'
debian: 'https://downloads.scylladb.com/deb/debian/scylladb-manager-3.5.list'
"3.4":
rhel: 'https://downloads.scylladb.com/rpm/centos/scylladb-manager-3.4.repo'
debian: 'https://downloads.scylladb.com/deb/debian/scylladb-manager-3.4.list'
"3.3":
rhel: 'https://downloads.scylladb.com/rpm/centos/scylladb-manager-3.3.repo'
debian: 'https://downloads.scylladb.com/deb/debian/scylladb-manager-3.3.list'
"3.2":
rhel: 'https://downloads.scylladb.com/rpm/centos/scylladb-manager-3.2.repo'
debian: 'https://downloads.scylladb.com/deb/debian/scylladb-manager-3.2.list'

scylla_backend_repo_by_version:
"2022":
rhel: 'https://downloads.scylladb.com/rpm/centos/scylla-2022.1.repo'
debian: 'https://downloads.scylladb.com/deb/debian/scylla-2022.1.list'
"2023":
rhel: 'https://downloads.scylladb.com/rpm/centos/scylla-2023.1.repo'
debian: 'https://downloads.scylladb.com/deb/debian/scylla-2023.1.list'
"2025":
rhel: 'https://downloads.scylladb.com/rpm/centos/scylla-2025.1.repo'
debian: 'https://downloads.scylladb.com/deb/debian/scylla-2025.1.list'
"2024":
rhel: 'https://downloads.scylladb.com/rpm/centos/scylla-2024.2.repo'
debian: 'https://downloads.scylladb.com/deb/debian/scylla-2024.2.list'
"2023":
rhel: 'https://downloads.scylladb.com/rpm/centos/scylla-2023.1.repo'
debian: 'https://downloads.scylladb.com/deb/debian/scylla-2023.1.list'
6 changes: 3 additions & 3 deletions defaults/test_default.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ip_ssh_connections: 'private'

scylla_repo: ''

manager_version: '3.4'
manager_version: '3.5'
manager_scylla_backend_version: '2024'
# 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

Expand Down Expand Up @@ -160,8 +160,8 @@ jepsen_test_count: 1
jepsen_test_run_policy: all

max_events_severities: ""
scylla_mgmt_agent_version: '3.4.0'
mgmt_docker_image: 'scylladb/scylla-manager:3.4.0'
scylla_mgmt_agent_version: '3.5.0'
mgmt_docker_image: 'scylladb/scylla-manager:3.5.0'
k8s_log_api_calls: false
k8s_deploy_monitoring: false
k8s_minio_storage_size: '10Gi'
Expand Down
6 changes: 3 additions & 3 deletions docs/configuration_options.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ Url to the repo of scylla manager agent version to install for management tests

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

**default:** 3.4
**default:** 3.5

**type:** str

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



**default:** 3.4.0
**default:** 3.5.0

**type:** str

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

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

**default:** scylladb/scylla-manager:3.4.0
**default:** scylladb/scylla-manager:3.5.0

**type:** str (appendable)

Expand Down
2 changes: 1 addition & 1 deletion jenkins-pipelines/manager/debian11-manager-install.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ 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',
scylla_version: '2024.2',

post_behavior_db_nodes: 'destroy',
post_behavior_loader_nodes: 'destroy',
Expand Down
2 changes: 1 addition & 1 deletion jenkins-pipelines/manager/debian11-manager-sanity.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ 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',
scylla_version: '2024.2',

post_behavior_db_nodes: 'destroy',
post_behavior_loader_nodes: 'destroy',
Expand Down
6 changes: 3 additions & 3 deletions jenkins-pipelines/manager/debian11-manager-upgrade.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ managerPipeline(
backend: 'aws',
region: 'us-east-1',

manager_version: '3.3',
target_manager_version: 'master_latest',
scylla_version: '2024.2',

scylla_version: '2024.1',
manager_version: '3.4',
target_manager_version: 'master_latest',

test_name: 'mgmt_upgrade_test.ManagerUpgradeTest.test_upgrade',
test_config: '''["test-cases/upgrades/manager-upgrade.yaml", "configurations/manager/debian11.yaml"]''',
Expand Down
6 changes: 3 additions & 3 deletions jenkins-pipelines/manager/ubuntu20-manager-upgrade.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ managerPipeline(
backend: 'aws',
region: 'us-east-1',

// Upgrade from previous minor release (choose non-last patch release which is still used in production)
// Use Metabase to check it (https://scylladb.metabaseapp.com/question/1685-manager-version)
manager_version: '3.4.1',
target_manager_version: 'master_latest',

// Upgrade from previous minor release (the first one)
manager_version: '3.3.0',

test_name: 'mgmt_upgrade_test.ManagerUpgradeTest.test_upgrade',
test_config: '''["test-cases/upgrades/manager-upgrade.yaml", "configurations/manager/ubuntu20.yaml"]''',

Expand Down
2 changes: 1 addition & 1 deletion jenkins-pipelines/manager/ubuntu22-manager-older-enterprise-sanity.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ managerPipeline(
backend: 'aws',
region: '''["us-east-1", "us-west-2"]''',

scylla_version: '2023.1',
scylla_version: '2024.1',

test_name: 'mgmt_cli_test.ManagerSanityTests.test_manager_sanity',
test_config: 'test-cases/manager/manager-regression-multiDC-set-distro.yaml',
Expand Down
5 changes: 2 additions & 3 deletions jenkins-pipelines/manager/ubuntu22-manager-older-enterprise-upgrade.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,11 @@ managerPipeline(
backend: 'aws',
region: 'us-east-1',

scylla_version: '2023.1',
scylla_version: '2024.1',

manager_version: '3.4',
target_manager_version: 'master_latest',

manager_version: '3.3',

test_name: 'mgmt_upgrade_test.ManagerUpgradeTest.test_upgrade',
test_config: 'test-cases/upgrades/manager-upgrade.yaml',

Expand Down
5 changes: 2 additions & 3 deletions jenkins-pipelines/manager/ubuntu22-manager-upgrade.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@ managerPipeline(
backend: 'aws',
region: 'us-east-1',

// Upgrade from the previous minor release (the last one)
manager_version: '3.4',
target_manager_version: 'master_latest',

// Upgrade from previous minor release (the last one), for this specific case it'd be 3.3.3
manager_version: '3.3',

test_name: 'mgmt_upgrade_test.ManagerUpgradeTest.test_upgrade',
test_config: 'test-cases/upgrades/manager-upgrade.yaml',

Expand Down
5 changes: 2 additions & 3 deletions jenkins-pipelines/manager/ubuntu24-manager-upgrade.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@ managerPipeline(
backend: 'aws',
region: 'us-east-1',

// Upgrade from the latest patch release
manager_version: '3.4',
target_manager_version: 'master_latest',

// Upgrade from latest patch release
manager_version: '3.4.0',

test_name: 'mgmt_upgrade_test.ManagerUpgradeTest.test_upgrade',
test_config: '''["test-cases/upgrades/manager-upgrade.yaml", "configurations/manager/ubuntu24.yaml", "configurations/disable_client_encrypt.yaml"]''',

Expand Down
21 changes: 20 additions & 1 deletion mgmt_cli_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,22 @@ def get_all_dcs_names(self):
dcs_names.add(data_center)
return dcs_names

def get_rf_based_on_nodes_number(self) -> dict[str, int]:
"""Define replication factor based on a number of nodes per DC(s).

Note: replication factor per DC will be equal to the number of nodes in that DC.
Adjust the method if you need a custom value to be put there.

Example of return value:
{
"eu-west-2scylla_node_west": 2,
"us-eastscylla_node_east": 1
}
"""
nodetool_status = self.db_cluster.get_nodetool_status(self.db_cluster.nodes[0])
rf = {dc_name: len(nodes) for dc_name, nodes in nodetool_status.items()}
return rf


class BucketOperations(ClusterTester):
backup_azure_blob_service = None
Expand Down Expand Up @@ -1120,7 +1136,10 @@ def test_repair_multiple_keyspace_types(self): # pylint: disable=invalid-name
self.log.info('starting test_repair_multiple_keyspace_types')
manager_tool = mgmt.get_scylla_manager_tool(manager_node=self.monitors.nodes[0])
mgr_cluster = self.ensure_and_get_cluster(manager_tool)
self.create_keyspace_and_basic_table(self.NETWORKSTRATEGY_KEYSPACE_NAME, replication_factor=2)

rf = self.get_rf_based_on_nodes_number() if len(self.params.region_names) > 1 else 2
self.create_keyspace_and_basic_table(self.NETWORKSTRATEGY_KEYSPACE_NAME, replication_factor=rf)

self.create_keyspace_and_basic_table(self.LOCALSTRATEGY_KEYSPACE_NAME, replication_factor=0)
repair_task = mgr_cluster.create_repair_task()
task_final_status = repair_task.wait_and_get_final_status(timeout=7200)
Expand Down
8 changes: 4 additions & 4 deletions unit_tests/test_sdcm_mgmt_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
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)
url = get_manager_scylla_backend("2025", Distro.UBUNTU22)

assert url == 'https://downloads.scylladb.com/deb/debian/scylla-2024.2.list'
assert url == 'https://downloads.scylladb.com/deb/debian/scylla-2025.1.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)
url = get_manager_repo_from_defaults("3.5", Distro.UBUNTU22)

assert url == 'https://downloads.scylladb.com/deb/debian/scylladb-manager-3.2.list'
assert url == 'https://downloads.scylladb.com/deb/debian/scylladb-manager-3.5.list'
4 changes: 2 additions & 2 deletions vars/managerPipeline.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ def call(Map pipelineParams) {


string(defaultValue: '', description: '', name: 'scylla_ami_id')
string(defaultValue: "${pipelineParams.get('scylla_version', '2024.2')}", description: '', name: 'scylla_version')
string(defaultValue: "${pipelineParams.get('scylla_version', '2025.1')}", 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', '')}",
Expand Down Expand Up @@ -107,7 +107,7 @@ def call(Map pipelineParams) {
name: 'ip_ssh_connections')

string(defaultValue: "${pipelineParams.get('manager_version', 'master_latest')}",
description: 'master_latest|3.4|3.3',
description: 'master_latest|3.5|3.4',
name: 'manager_version')

string(defaultValue: "${pipelineParams.get('scylla_mgmt_address', '')}",
Expand Down
Loading