Skip to content

Commit

Permalink
fix(manager): update default Scylla version to 2024.2 for Manager tests
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
mikliapko authored and fruch committed Jan 2, 2025
1 parent 2f0d6b6 commit 9912e13
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 7 deletions.
4 changes: 2 additions & 2 deletions defaults/manager_versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 2 additions & 0 deletions jenkins-pipelines/manager/debian11-manager-sanity.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"]''',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion unit_tests/test_sdcm_mgmt_common.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion vars/managerPipeline.groovy
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.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', '')}",
Expand Down

0 comments on commit 9912e13

Please sign in to comment.