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

Support mariadb repository #54

Merged
merged 2 commits into from
Jul 23, 2024
Merged

Support mariadb repository #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b0e6a4
Support mariadb installed from the yum.mariadb.org repository
Jul 23, 2024
d66c553
Add tests for new repository adoption
Jul 23, 2024
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
1 change: 1 addition & 0 deletions pleskdistup/common/src/leapp_configs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ def _do_url_replacement(url: typing.Optional[str]) -> typing.Optional[str]:
lambda to_change: to_change.replace("centos7", "centos8"),
lambda to_change: to_change.replace("centos/7", "centos/8"),
lambda to_change: to_change.replace("rhel/7", "rhel/8"),
lambda to_change: to_change.replace("rhel7", "rhel8"),
lambda to_change: to_change.replace("CentOS_7", "CentOS_8"),
lambda to_change: to_change.replace("rhel-$releasever", "rhel-8"),
lambda to_change: to_change.replace("$releasever", "8"),
Expand Down
14 changes: 14 additions & 0 deletions pleskdistup/common/tests/leapp_configs_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,13 @@ def test_mariadb_mapping(self):
module_hotfixes=1
gpgkey=https://yum.mariadb.org/RPM-GPG-KEY-MariaDB
gpgcheck=1

[mariadb rhel]
name = Other MariaDB
baseurl=http://yum.mariadb.org/10.11.8/rhel7-amd64
module_hotfixes=1
gpgkey=https://yum.mariadb.org/RPM-GPG-KEY-MariaDB
gpgcheck=1
"""

expected_mariadb_repos = """[alma-mariadb]
Expand All @@ -223,9 +230,16 @@ def test_mariadb_mapping(self):
module_hotfixes=1
gpgkey=https://yum.mariadb.org/RPM-GPG-KEY-MariaDB
gpgcheck=1
[alma-mariadb rhel]
name=Alma Other MariaDB
baseurl=http://yum.mariadb.org/10.11.8/rhel8-amd64
module_hotfixes=1
gpgkey=https://yum.mariadb.org/RPM-GPG-KEY-MariaDB
gpgcheck=1
"""

expected_mariadb_mapping = """mariadb,alma-mariadb,alma-mariadb,all,all,x86_64,rpm,ga,ga
mariadb rhel,alma-mariadb rhel,alma-mariadb rhel,all,all,x86_64,rpm,ga,ga
"""

self._perform_test({"mariadb.repo": mariadb_like_repos},
Expand Down
Loading