Skip to content

Commit 94a2fef

Browse files
yuravkyuravk
committed
Add Nginx Vendor for 9 to 10 upgrade
CI: enable nginx vendor for 9 to 10. Correct nging mainline 8 to 9 map data. Bump the package release. (cherry picked from commit 3debb55)
1 parent e8d10ff commit 94a2fef

7 files changed

Lines changed: 155 additions & 8 deletions

‎.github/workflows/elevate.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -546,7 +546,7 @@ jobs:
546546
sudo vagrant ssh elevatevm -c "sudo /vagrant/Vendors.sh kernelcare ${{ env.source_release }}" || exit 1
547547
548548
- name: Vendor - Nginx
549-
if: inputs.vendors == 'all' && env.target_release != '10'
549+
if: inputs.vendors == 'all'
550550
run: |
551551
sudo vagrant ssh elevatevm -c "sudo /vagrant/Vendors.sh nginx ${{ env.source_release }}" || exit 1
552552

‎leapp-data.spec‎

Lines changed: 5 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 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,9 @@ 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 Nginx Vendor for 9 to 10 upgrade
164+
162165
* Thu Sep 11 2025 Yuriy Kohut <[email protected]> - 0.10-5.20250729
163166
- Vendor imunify: update rpm GPG key
164167

‎vendors.d/nginx-mainline.repo.el10‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[el10-nginx-mainline]
2+
name=nginx mainline repo
3+
baseurl=http://nginx.org/packages/mainline/centos/10/$basearch/
4+
gpgcheck=1
5+
enabled=0
6+
gpgkey=https://nginx.org/keys/nginx_signing.key
7+
module_hotfixes=true

‎vendors.d/nginx-mainline_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": "202510141425Z",
3+
"version_format": "1.3.0",
4+
"mapping": [
5+
{
6+
"source_major_version": "9",
7+
"target_major_version": "10",
8+
"entries": [
9+
{
10+
"source": "nginx-mainline",
11+
"target": [
12+
"el10-nginx-mainline"
13+
]
14+
}
15+
]
16+
}
17+
],
18+
"repositories": [
19+
{
20+
"pesid": "nginx-mainline",
21+
"entries": [
22+
{
23+
"major_version": "9",
24+
"repoid": "nginx-mainline",
25+
"arch": "x86_64",
26+
"channel": "ga",
27+
"repo_type": "rpm",
28+
"distro": "{distro}"
29+
},
30+
{
31+
"major_version": "9",
32+
"repoid": "nginx-mainline",
33+
"arch": "aarch64",
34+
"channel": "ga",
35+
"repo_type": "rpm",
36+
"distro": "{distro}"
37+
}
38+
]
39+
},
40+
{
41+
"pesid": "el10-nginx-mainline",
42+
"entries": [
43+
{
44+
"major_version": "10",
45+
"repoid": "el10-nginx-mainline",
46+
"arch": "x86_64",
47+
"channel": "ga",
48+
"repo_type": "rpm",
49+
"distro": "{distro}"
50+
},
51+
{
52+
"major_version": "10",
53+
"repoid": "el10-nginx-mainline",
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/nginx-mainline_map.json_template.el9‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
{
1010
"source": "nginx-mainline",
1111
"target": [
12-
"el8-nginx-mainline"
12+
"el9-nginx-mainline"
1313
]
1414
}
1515
]
@@ -46,27 +46,27 @@
4646
]
4747
},
4848
{
49-
"pesid": "el8-nginx-mainline",
49+
"pesid": "el9-nginx-mainline",
5050
"entries": [
5151
{
5252
"major_version": "9",
53-
"repoid": "el8-nginx-mainline",
53+
"repoid": "el9-nginx-mainline",
5454
"arch": "x86_64",
5555
"channel": "ga",
5656
"repo_type": "rpm",
5757
"distro": "{distro}"
5858
},
5959
{
6060
"major_version": "9",
61-
"repoid": "el8-nginx-mainline",
61+
"repoid": "el9-nginx-mainline",
6262
"arch": "aarch64",
6363
"channel": "ga",
6464
"repo_type": "rpm",
6565
"distro": "{distro}"
6666
},
6767
{
6868
"major_version": "9",
69-
"repoid": "el8-nginx-mainline",
69+
"repoid": "el9-nginx-mainline",
7070
"arch": "s390x",
7171
"channel": "ga",
7272
"repo_type": "rpm",

‎vendors.d/nginx-stable.repo.el10‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[el10-nginx-stable]
2+
name=nginx stable repo
3+
baseurl=http://nginx.org/packages/centos/10/$basearch/
4+
gpgcheck=1
5+
enabled=0
6+
gpgkey=https://nginx.org/keys/nginx_signing.key
7+
module_hotfixes=true

‎vendors.d/nginx-stable_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": "202510141425Z",
3+
"version_format": "1.3.0",
4+
"mapping": [
5+
{
6+
"source_major_version": "9",
7+
"target_major_version": "10",
8+
"entries": [
9+
{
10+
"source": "nginx-stable",
11+
"target": [
12+
"el10-nginx-stable"
13+
]
14+
}
15+
]
16+
}
17+
],
18+
"repositories": [
19+
{
20+
"pesid": "nginx-stable",
21+
"entries": [
22+
{
23+
"major_version": "9",
24+
"repoid": "nginx-stable",
25+
"arch": "x86_64",
26+
"channel": "ga",
27+
"repo_type": "rpm",
28+
"distro": "{distro}"
29+
},
30+
{
31+
"major_version": "9",
32+
"repoid": "nginx-stable",
33+
"arch": "aarch64",
34+
"channel": "ga",
35+
"repo_type": "rpm",
36+
"distro": "{distro}"
37+
}
38+
]
39+
},
40+
{
41+
"pesid": "el10-nginx-stable",
42+
"entries": [
43+
{
44+
"major_version": "10",
45+
"repoid": "el10-nginx-stable",
46+
"arch": "x86_64",
47+
"channel": "ga",
48+
"repo_type": "rpm",
49+
"distro": "{distro}"
50+
},
51+
{
52+
"major_version": "10",
53+
"repoid": "el10-nginx-stable",
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+
}

0 commit comments

Comments
 (0)