Skip to content

Commit fba5236

Browse files
eabdullin1eabdullin1
authored
Merge pull request #169 from yuravk/devel-ng-0.22.0
Enable Nginx, MariaDB, KernelCare vendors for 9 to 10 upgrade
2 parents e8d10ff + 4214385 commit fba5236

16 files changed

Lines changed: 484 additions & 26 deletions

‎.github/workflows/elevate.yml‎

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -405,19 +405,8 @@ jobs:
405405
fi
406406
407407
if [ "${vendor}" = "microsoft" ]; then
408-
case ${source_release} in
409-
7)
410-
ms_release_pkg=packages-microsoft-prod-1.0-1.el7.noarch.rpm
411-
ms_pkgs="omi aspnetcore-runtime-7.0 dotnet-targeting-pack-7.0 dotnet-sdk-7.0"
412-
;;
413-
8)
414-
ms_release_pkg=packages-microsoft-prod.rpm
415-
ms_pkgs="sysmonforlinux sysinternalsebpf procmon"
416-
;;
417-
esac
418-
419-
sudo dnf install -y -q https://packages.microsoft.com/rhel/${source_release}/prod/Packages/p/${ms_release_pkg}
420-
sudo dnf install -y ${ms_pkgs}
408+
sudo dnf install -y -q https://packages.microsoft.com/config/rhel/${source_release}/packages-microsoft-prod.rpm
409+
sudo dnf install -y azure-cli
421410
res=$?
422411
fi
423412
@@ -541,17 +530,17 @@ jobs:
541530
sudo vagrant ssh elevatevm -c "sudo /vagrant/Vendors.sh epel ${{ env.source_release }}" || exit 1
542531
543532
- name: Vendor - KernelCare
544-
if: inputs.vendors == 'all' && env.target_release != '10'
533+
if: inputs.vendors == 'all'
545534
run: |
546535
sudo vagrant ssh elevatevm -c "sudo /vagrant/Vendors.sh kernelcare ${{ env.source_release }}" || exit 1
547536
548537
- name: Vendor - Nginx
549-
if: inputs.vendors == 'all' && env.target_release != '10'
538+
if: inputs.vendors == 'all'
550539
run: |
551540
sudo vagrant ssh elevatevm -c "sudo /vagrant/Vendors.sh nginx ${{ env.source_release }}" || exit 1
552541
553542
- name: Vendor - MariaDB
554-
if: inputs.vendors == 'all' && env.target_release != '10'
543+
if: inputs.vendors == 'all'
555544
run: |
556545
sudo vagrant ssh elevatevm -c "sudo /vagrant/Vendors.sh mariadb ${{ env.source_release }}" || exit 1
557546
@@ -566,7 +555,7 @@ jobs:
566555
sudo vagrant ssh elevatevm -c "sudo /vagrant/Vendors.sh docker ${{ env.source_release }}" || exit 1
567556
568557
- name: Vendor - Microsoft
569-
if: false && inputs.vendors == 'all' && env.target_release != '10'
558+
if: false && inputs.vendors == 'all'
570559
run: |
571560
sudo vagrant ssh elevatevm -c "sudo /vagrant/Vendors.sh microsoft ${{ env.source_release }}" || exit 1
572561

‎leapp-data.spec‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
%endif
2929
%endif
3030
%if 0%{?rhel} == 9
31-
%define supported_vendors epel docker-ce postgresql tuxcare
31+
%define supported_vendors epel kernelcare mariadb nginx-stable nginx-mainline docker-ce postgresql tuxcare
3232
%define target_version 10
3333
%define dist_gpg_path distro/%{dist_name}/rpm-gpg/%{target_version}
3434
%if "%{dist_name}" == "almalinux"
@@ -47,7 +47,7 @@
4747

4848
Name: leapp-data-%{dist_name}
4949
Version: 0.10
50-
Release: 5%{?dist}.%{pes_events_build_date}
50+
Release: 6%{?dist}.%{pes_events_build_date}
5151
Summary: data for migrating tool
5252
Group: Applications/Databases
5353
License: ASL 2.0
@@ -159,6 +159,13 @@ python3 tests/check_debranding.py %{buildroot}%{_sysconfdir}/leapp/files/pes-eve
159159

160160

161161
%changelog
162+
* Tue Oct 14 2025 Yuriy Kohut <[email protected]> - 0.10-6.20250729
163+
- Add new Vendors for 9 to 10 upgrade:
164+
- Nginx Vendor
165+
- MariaDB Vendor (without MaxScale and Tools repositories)
166+
- Microsoft Vendor (still disabled for all upgrades)
167+
- KernelCare Vendor (use el-sig202505 repository)
168+
162169
* Thu Sep 11 2025 Yuriy Kohut <[email protected]> - 0.10-5.20250729
163170
- Vendor imunify: update rpm GPG key
164171

‎vendors.d/kernelcare.repo.el10‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# KernelCare repository.
2+
3+
[kernelcare-10]
4+
name=kernelcare
5+
baseurl=https://repo.cloudlinux.com/kernelcare/el-sig202505/10/$basearch
6+
enabled=1
7+
gpgcheck=1
8+
gpgkey=file:///etc/leapp/files/vendors.d/rpm-gpg/kernelcare.gpg

‎vendors.d/kernelcare.repo.el8‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[kernelcare-8]
44
name=kernelcare
5-
baseurl=https://repo.cloudlinux.com/kernelcare/8/$basearch
5+
baseurl=https://repo.cloudlinux.com/kernelcare/el-sig202505/8/$basearch
66
enabled=1
77
gpgcheck=1
88
gpgkey=file:///etc/leapp/files/vendors.d/rpm-gpg/kernelcare.gpg

‎vendors.d/kernelcare.repo.el9‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[kernelcare-9]
44
name=kernelcare
5-
baseurl=https://repo.cloudlinux.com/kernelcare/9/$basearch
5+
baseurl=https://repo.cloudlinux.com/kernelcare/el-sig202505/9/$basearch
66
enabled=1
77
gpgcheck=1
88
gpgkey=file:///etc/leapp/files/vendors.d/rpm-gpg/kernelcare.gpg

‎vendors.d/kernelcare_map.json_template.el10‎

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

‎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_template.el10‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
{
2+
"datetime": "202510141430Z",
3+
"version_format": "1.3.0",
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+
"distro": "{distro}"
29+
},
30+
{
31+
"major_version": "9",
32+
"repoid": "mariadb-main",
33+
"arch": "aarch64",
34+
"channel": "ga",
35+
"repo_type": "rpm",
36+
"distro": "{distro}"
37+
}
38+
]
39+
},
40+
{
41+
"pesid": "el10-mariadb-main",
42+
"entries": [
43+
{
44+
"major_version": "10",
45+
"repoid": "el10-mariadb-main",
46+
"arch": "x86_64",
47+
"channel": "ga",
48+
"repo_type": "rpm",
49+
"distro": "{distro}"
50+
},
51+
{
52+
"major_version": "10",
53+
"repoid": "el10-mariadb-main",
54+
"arch": "aarch64",
55+
"channel": "ga",
56+
"repo_type": "rpm",
57+
"distro": "{distro}"
58+
}
59+
]
60+
}
61+
],
62+
"provided_data_streams": [
63+
"4.0"
64+
]
65+
}

‎vendors.d/microsoft.repo.el10‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[packages-microsoft-com-prod-10]
2+
name=packages-microsoft-com-prod-10
3+
baseurl=https://packages.microsoft.com/rhel/10/prod/
4+
enabled=1
5+
gpgcheck=1
6+
gpgkey=https://packages.microsoft.com/keys/microsoft.asc

‎vendors.d/microsoft_map.json_template.el10‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
{
2+
"datetime" : "202510131320Z",
3+
"version_format": "1.3.0",
4+
5+
"mapping" : [
6+
{
7+
"source_major_version" : "9",
8+
"target_major_version" : "10",
9+
"entries" : [
10+
{
11+
"source" : "packages-microsoft-com-prod",
12+
"target" : ["packages-microsoft-com-prod-10"]
13+
}
14+
]
15+
}
16+
],
17+
18+
"repositories" : [
19+
{
20+
"pesid" : "packages-microsoft-com-prod",
21+
"entries" : [
22+
{
23+
"repoid" : "packages-microsoft-com-prod",
24+
"major_version" : "9",
25+
"repo_type" : "rpm",
26+
"arch" : "x86_64",
27+
"channel" : "ga",
28+
"distro": "{distro}"
29+
}
30+
]
31+
},
32+
{
33+
"pesid" : "packages-microsoft-com-prod-10",
34+
"entries" : [
35+
{
36+
"repoid" : "packages-microsoft-com-prod-10",
37+
"major_version" : "10",
38+
"repo_type" : "rpm",
39+
"arch" : "x86_64",
40+
"channel" : "ga",
41+
"distro": "{distro}"
42+
}
43+
]
44+
}
45+
],
46+
"provided_data_streams": [
47+
"4.0"
48+
]
49+
}

0 commit comments

Comments
 (0)