Skip to content
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

fix(manager): update default Scylla version to 2024.2 for Manager tests #9622

Merged
merged 1 commit into from
Jan 2, 2025
Merged

fix(manager): update default Scylla version to 2024.2 for Manager tests #9622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions defaults/manager_versions.yaml
View file
Open in desktop
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'
2 changes: 2 additions & 0 deletions 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,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',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't be 2024.2?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I put 2024.1 there by purpose for debian jobs to keep some coverage for 2024.1 too since it's still used in Production.


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
View file
Open in desktop
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
3 changes: 2 additions & 1 deletion 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,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
2 changes: 0 additions & 2 deletions jenkins-pipelines/manager/ubuntu22-manager-vnodes-tablets-enterprise.jenkinsfile
View file
Open in desktop
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
View file
Open in desktop
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
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.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
Loading