Skip to content

Commit 9fb119d

Browse files
eabdullin1eabdullin1
authored
Merge pull request #172 from yuravk/devel-ng-0.22.0-stream-3.x
New Vendor ELevate. imunify360-alt-php Vendor for 9 to 10
2 parents fd319b5 + 5ff220f commit 9fb119d

14 files changed

Lines changed: 360 additions & 5 deletions

‎leapp-data.spec‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
%define conflict_dists() %(for i in almalinux almalinux-kitten centos oraclelinux rocky; do if [ "${i}" != "%{dist_name}" ]; then echo -n "leapp-data-${i} "; fi; done)
77

88
%if 0%{?rhel} == 7
9-
%define supported_vendors epel imunify kernelcare mariadb nginx-stable nginx-mainline postgresql docker-ce imunify360-alt-php tuxcare
9+
%define supported_vendors epel imunify kernelcare mariadb nginx-stable nginx-mainline postgresql docker-ce imunify360-alt-php tuxcare elevate
1010
%define target_version 8
1111
%define dist_gpg_path distro/%{dist_name}/rpm-gpg/%{target_version}
1212
%if %{dist_name} == "almalinux"
@@ -23,7 +23,7 @@
2323
%endif
2424
%endif
2525
%if 0%{?rhel} == 8
26-
%define supported_vendors epel kernelcare mariadb nginx-stable nginx-mainline postgresql docker-ce tuxcare
26+
%define supported_vendors epel kernelcare mariadb nginx-stable nginx-mainline postgresql docker-ce tuxcare elevate
2727
%define target_version 9
2828
%define dist_gpg_path distro/%{dist_name}/rpm-gpg/%{target_version}
2929
%if "%{dist_name}" == "almalinux"
@@ -40,7 +40,7 @@
4040
%endif
4141
%endif
4242
%if 0%{?rhel} == 9
43-
%define supported_vendors epel imunify kernelcare mariadb nginx-stable nginx-mainline docker-ce postgresql tuxcare
43+
%define supported_vendors epel imunify kernelcare mariadb nginx-stable nginx-mainline docker-ce postgresql imunify360-alt-php tuxcare elevate
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,12 @@ python3 tests/check_debranding.py %{buildroot}%{_sysconfdir}/leapp/files/pes-eve
172172

173173
%changelog
174174
* Fri Oct 17 2025 Yuriy Kohut <[email protected]> - 0.9-9.20251013
175-
- Add new imunify Vendor for 9 to 10 upgrade
175+
- Add new Vendor, elevate - ELevate enables upgrades between major versions of RHEL derivatives
176+
- Add new Vendors for 9 to 10 upgrade:
177+
- imunify Vendor
178+
- imunify360-alt-php Vendor
179+
- Vendor imunify360-alt-php update rpm GPG key
180+
- Vendors imunify and imunify360-alt-php: update packages SIGs
176181

177182
* Mon Oct 13 2025 Yuriy Kohut <[email protected]> - 0.9-8.20251013
178183
- Add new Vendors for 9 to 10 upgrade:

‎vendors.d/elevate.repo.el10‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[el10-elevate]
2+
name=ELevate
3+
baseurl=https://repo.almalinux.org/elevate/el10/$basearch/
4+
gpgcheck=1
5+
enabled=1
6+
priority=90
7+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-ELevate

‎vendors.d/elevate.repo.el8‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[el8-elevate]
2+
name=ELevate
3+
baseurl=https://repo.almalinux.org/elevate/el8/$basearch/
4+
gpgcheck=1
5+
enabled=1
6+
priority=90
7+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-ELevate

‎vendors.d/elevate.repo.el9‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[el9-elevate]
2+
name=ELevate
3+
baseurl=https://repo.almalinux.org/elevate/el9/$basearch/
4+
gpgcheck=1
5+
enabled=1
6+
priority=90
7+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-ELevate

‎vendors.d/elevate.sigs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
c52feb6b621e9f35

‎vendors.d/elevate_map.json.el10‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
{
2+
"datetime" : "202510161800Z",
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" : "elevate",
12+
"target" : ["elevate-10"]
13+
}
14+
]
15+
}
16+
],
17+
18+
"repositories" : [
19+
{
20+
"pesid" : "elevate",
21+
"entries" : [
22+
{
23+
"repoid" : "elevate",
24+
"major_version" : "9",
25+
"repo_type" : "rpm",
26+
"arch" : "x86_64",
27+
"channel" : "ga"
28+
},
29+
{
30+
"repoid" : "elevate",
31+
"major_version" : "9",
32+
"repo_type" : "rpm",
33+
"arch" : "aarch64",
34+
"channel" : "ga"
35+
},
36+
{
37+
"repoid" : "elevate",
38+
"major_version" : "9",
39+
"repo_type" : "rpm",
40+
"arch" : "ppc64le",
41+
"channel" : "ga"
42+
}
43+
]
44+
},
45+
{
46+
"pesid" : "elevate-10",
47+
"entries" : [
48+
{
49+
"repoid" : "elevate-10",
50+
"major_version" : "10",
51+
"repo_type" : "rpm",
52+
"arch" : "x86_64",
53+
"channel" : "ga"
54+
},
55+
{
56+
"repoid" : "elevate-10",
57+
"major_version" : "10",
58+
"repo_type" : "rpm",
59+
"arch" : "aarch64",
60+
"channel" : "ga"
61+
},
62+
{
63+
"repoid" : "elevate-10",
64+
"major_version" : "10",
65+
"repo_type" : "rpm",
66+
"arch" : "ppc64le",
67+
"channel" : "ga"
68+
}
69+
]
70+
}
71+
]
72+
}

‎vendors.d/elevate_map.json.el8‎

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

‎vendors.d/elevate_map.json.el9‎

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

‎vendors.d/elevate_pes.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"legal_notice": "",
3+
"packageinfo": [],
4+
"provided_data_streams": [
5+
"2.0",
6+
"3.0",
7+
"3.1"
8+
],
9+
"timestamp": "202510161800Z"
10+
}

‎vendors.d/imunify.sigs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
8c55a6628608cb71
1+
8c55a6628608cb71
2+
bc9a243190e02617

0 commit comments

Comments
 (0)