Skip to content

Commit 84e10b9

Browse files
committed
Add MariaDB Vendor for 9 to 10 upgrade
Remove mariadb-maxscale and mariadb-tools repositories for 9 to 10 upgrade, as they aren't available in EL10. CI: enable mariadb vendor for 9 to 10.
1 parent 3debb55 commit 84e10b9

4 files changed

Lines changed: 95 additions & 3 deletions

File tree

.github/workflows/elevate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,7 @@ jobs:
591591
sudo vagrant ssh elevatevm -c "sudo /vagrant/Vendors.sh nginx ${{ env.source_release }}" || exit 1
592592
593593
- name: Vendor - MariaDB
594-
if: inputs.vendors == 'all' && env.target_release != '10'
594+
if: inputs.vendors == 'all'
595595
run: |
596596
sudo vagrant ssh elevatevm -c "sudo /vagrant/Vendors.sh mariadb ${{ env.source_release }}" || exit 1
597597

leapp-data.spec

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
%endif
4141
%endif
4242
%if 0%{?rhel} == 9
43-
%define supported_vendors epel nginx-stable nginx-mainline docker-ce postgresql tuxcare
43+
%define supported_vendors epel mariadb nginx-stable nginx-mainline docker-ce postgresql tuxcare
4444
%define target_version 10
4545
%define dist_gpg_path distro/%{dist_name}/rpm-gpg/%{target_version}
4646
%if "%{dist_name}" == "almalinux"
@@ -172,7 +172,9 @@ python3 tests/check_debranding.py %{buildroot}%{_sysconfdir}/leapp/files/pes-eve
172172

173173
%changelog
174174
* Mon Oct 13 2025 Yuriy Kohut <[email protected]> - 0.9-8.20251013
175-
- Add Nginx Vendor for 9 to 10 upgrade
175+
- Add new Vendors for 9 to 10 upgrade:
176+
- Nginx Vendor
177+
- MariaDB Vendor (without MaxScale and Tools repositories)
176178

177179
* Thu Sep 11 2025 Yuriy Kohut <[email protected]> - 0.9-7.20250729
178180
- Vendor imunify: update rpm GPG key

vendors.d/mariadb.repo.el10

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
[el10-mariadb-main]
2+
name = MariaDB Server
3+
baseurl = https://dlm.mariadb.com/repo/mariadb-server/12.rolling/yum/rhel/10/$basearch
4+
gpgkey = file:///etc/leapp/files/vendors.d/rpm-gpg/mariadb-Server-GPG-KEY
5+
gpgcheck = 1
6+
enabled = 1
7+
module_hotfixes = true
8+
9+
# [el10-mariadb-maxscale]
10+
# # To use the latest stable release of MaxScale, use "latest" as the version
11+
# # To use the latest beta (or stable if no current beta) release of MaxScale, use "beta" as the version
12+
# name = MariaDB MaxScale
13+
# baseurl = https://dlm.mariadb.com/repo/maxscale/latest/yum/rhel/10/$basearch
14+
# gpgkey = file:///etc/leapp/files/vendors.d/rpm-gpg/mariadb-MaxScale-GPG-KEY
15+
# gpgcheck = 1
16+
# enabled = 1
17+
# module_hotfixes = true
18+
19+
20+
# [el10-mariadb-tools]
21+
# name = MariaDB Tools
22+
# baseurl = https://downloads.mariadb.com/Tools/rhel/10/x86_64
23+
# gpgkey = file:///etc/leapp/files/vendors.d/rpm-gpg/mariadb-Enterprise-GPG-KEY
24+
# gpgcheck = 1
25+
# enabled = 1
26+
# module_hotfixes = true

vendors.d/mariadb_map.json.el10

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
{
2+
"datetime": "202410111815Z",
3+
"version_format": "1.2.1",
4+
"mapping": [
5+
{
6+
"source_major_version": "9",
7+
"target_major_version": "10",
8+
"entries": [
9+
{
10+
"source": "mariadb-main",
11+
"target": [
12+
"el10-mariadb-main"
13+
]
14+
}
15+
]
16+
}
17+
],
18+
"repositories": [
19+
{
20+
"pesid": "mariadb-main",
21+
"entries": [
22+
{
23+
"major_version": "9",
24+
"repoid": "mariadb-main",
25+
"arch": "x86_64",
26+
"channel": "ga",
27+
"repo_type": "rpm"
28+
},
29+
{
30+
"major_version": "9",
31+
"repoid": "mariadb-main",
32+
"arch": "aarch64",
33+
"channel": "ga",
34+
"repo_type": "rpm"
35+
}
36+
]
37+
},
38+
{
39+
"pesid": "el10-mariadb-main",
40+
"entries": [
41+
{
42+
"major_version": "10",
43+
"repoid": "el10-mariadb-main",
44+
"arch": "x86_64",
45+
"channel": "ga",
46+
"repo_type": "rpm"
47+
},
48+
{
49+
"major_version": "10",
50+
"repoid": "el10-mariadb-main",
51+
"arch": "aarch64",
52+
"channel": "ga",
53+
"repo_type": "rpm"
54+
}
55+
]
56+
}
57+
],
58+
"provided_data_streams": [
59+
"1.1",
60+
"2.0",
61+
"3.0",
62+
"3.1"
63+
]
64+
}

0 commit comments

Comments
 (0)