Skip to content

Commit dc51b8b

Browse files
eabdullin1eabdullin1
authored
Merge pull request #168 from yuravk/devel-ng-0.22.0-stream-3.x
Enable Nginx, MariaDB, KernelCare vendors for 9 to 10 upgrade
2 parents 0d9ad39 + a8ed96a commit dc51b8b

16 files changed

Lines changed: 474 additions & 26 deletions

‎.github/workflows/elevate.yml‎

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -445,19 +445,8 @@ jobs:
445445
fi
446446
447447
if [ "${vendor}" = "microsoft" ]; then
448-
case ${source_release} in
449-
7)
450-
ms_release_pkg=packages-microsoft-prod-1.0-1.el7.noarch.rpm
451-
ms_pkgs="omi aspnetcore-runtime-7.0 dotnet-targeting-pack-7.0 dotnet-sdk-7.0"
452-
;;
453-
8)
454-
ms_release_pkg=packages-microsoft-prod.rpm
455-
ms_pkgs="sysmonforlinux sysinternalsebpf procmon"
456-
;;
457-
esac
458-
459-
sudo dnf install -y -q https://packages.microsoft.com/rhel/${source_release}/prod/Packages/p/${ms_release_pkg}
460-
sudo dnf install -y ${ms_pkgs}
448+
sudo dnf install -y -q https://packages.microsoft.com/config/rhel/${source_release}/packages-microsoft-prod.rpm
449+
sudo dnf install -y azure-cli
461450
res=$?
462451
fi
463452
@@ -581,17 +570,17 @@ jobs:
581570
sudo vagrant ssh elevatevm -c "sudo /vagrant/Vendors.sh epel ${{ env.source_release }}" || exit 1
582571
583572
- name: Vendor - KernelCare
584-
if: inputs.vendors == 'all' && env.target_release != '10'
573+
if: inputs.vendors == 'all'
585574
run: |
586575
sudo vagrant ssh elevatevm -c "sudo /vagrant/Vendors.sh kernelcare ${{ env.source_release }}" || exit 1
587576
588577
- name: Vendor - Nginx
589-
if: inputs.vendors == 'all' && env.target_release != '10'
578+
if: inputs.vendors == 'all'
590579
run: |
591580
sudo vagrant ssh elevatevm -c "sudo /vagrant/Vendors.sh nginx ${{ env.source_release }}" || exit 1
592581
593582
- name: Vendor - MariaDB
594-
if: inputs.vendors == 'all' && env.target_release != '10'
583+
if: inputs.vendors == 'all'
595584
run: |
596585
sudo vagrant ssh elevatevm -c "sudo /vagrant/Vendors.sh mariadb ${{ env.source_release }}" || exit 1
597586
@@ -606,7 +595,7 @@ jobs:
606595
sudo vagrant ssh elevatevm -c "sudo /vagrant/Vendors.sh docker ${{ env.source_release }}" || exit 1
607596
608597
- name: Vendor - Microsoft
609-
if: false && inputs.vendors == 'all' && env.target_release != '10'
598+
if: false && inputs.vendors == 'all'
610599
run: |
611600
sudo vagrant ssh elevatevm -c "sudo /vagrant/Vendors.sh microsoft ${{ env.source_release }}" || exit 1
612601

‎leapp-data.spec‎

Lines changed: 9 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 docker-ce postgresql tuxcare
43+
%define supported_vendors epel kernelcare 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"
@@ -59,7 +59,7 @@
5959

6060
Name: leapp-data-%{dist_name}
6161
Version: 0.9
62-
Release: 7%{?dist}.%{pes_events_build_date}
62+
Release: 8%{?dist}.%{pes_events_build_date}
6363
Summary: data for migrating tool
6464
Group: Applications/Databases
6565
License: ASL 2.0
@@ -171,6 +171,13 @@ python3 tests/check_debranding.py %{buildroot}%{_sysconfdir}/leapp/files/pes-eve
171171

172172

173173
%changelog
174+
* Mon Oct 13 2025 Yuriy Kohut <[email protected]> - 0.9-8.20251013
175+
- Add new Vendors for 9 to 10 upgrade:
176+
- Nginx Vendor
177+
- MariaDB Vendor (without MaxScale and Tools repositories)
178+
- Microsoft Vendor (still disabled for all upgrades)
179+
- KernelCare Vendor (use el-sig202505 repository)
180+
174181
* Thu Sep 11 2025 Yuriy Kohut <[email protected]> - 0.9-7.20250729
175182
- Vendor imunify: update rpm GPG key
176183

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

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

‎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+
}

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

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
{
2+
"datetime" : "202510131320Z",
3+
"version_format" : "1.2.1",
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+
}
29+
]
30+
},
31+
{
32+
"pesid" : "packages-microsoft-com-prod-10",
33+
"entries" : [
34+
{
35+
"repoid" : "packages-microsoft-com-prod-10",
36+
"major_version" : "10",
37+
"repo_type" : "rpm",
38+
"arch" : "x86_64",
39+
"channel" : "ga"
40+
}
41+
]
42+
}
43+
]
44+
}

0 commit comments

Comments
 (0)