Skip to content

Commit 1126764

Browse files
yuravkyuravk
committed
Add Microsoft Vendor for 9 to 10 upgrade
CI: microsoft remain disabled for all upgrades. (cherry picked from commit db97eba)
1 parent 4badf0a commit 1126764

5 files changed

Lines changed: 161 additions & 14 deletions

File tree

‎.github/workflows/elevate.yml‎

Lines changed: 3 additions & 14 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
@@ -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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ python3 tests/check_debranding.py %{buildroot}%{_sysconfdir}/leapp/files/pes-eve
163163
- Add new Vendors for 9 to 10 upgrade:
164164
- Nginx Vendor
165165
- MariaDB Vendor (without MaxScale and Tools repositories)
166+
- Microsoft Vendor (still disabled for all upgrades)
166167

167168
* Thu Sep 11 2025 Yuriy Kohut <[email protected]> - 0.10-5.20250729
168169
- Vendor imunify: update rpm GPG key

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

‎vendors.d/microsoft_pes.json_template.el10‎

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
{
2+
"legal_notice": "",
3+
"packageinfo": [
4+
{
5+
"action": 1,
6+
"architectures": [
7+
"x86_64"
8+
],
9+
"id": 1,
10+
"in_packageset": {
11+
"package": [
12+
{
13+
"modulestreams": [
14+
null
15+
],
16+
"name": "procmon",
17+
"repository": "packages-microsoft-com-prod"
18+
}
19+
],
20+
"set_id": 2
21+
},
22+
"initial_release": {
23+
"major_version": 9,
24+
"minor_version": 0,
25+
"os_name": "{os_name}"
26+
},
27+
"modulestream_maps": [],
28+
"out_packageset": null,
29+
"release": {
30+
"major_version": 10,
31+
"minor_version": 0,
32+
"os_name": "{os_name}"
33+
}
34+
},
35+
{
36+
"action": 1,
37+
"architectures": [
38+
"x86_64"
39+
],
40+
"id": 3,
41+
"in_packageset": {
42+
"package": [
43+
{
44+
"modulestreams": [
45+
null
46+
],
47+
"name": "sysinternalsebpf",
48+
"repository": "packages-microsoft-com-prod"
49+
}
50+
],
51+
"set_id": 4
52+
},
53+
"initial_release": {
54+
"major_version": 9,
55+
"minor_version": 0,
56+
"os_name": "{os_name}"
57+
},
58+
"modulestream_maps": [],
59+
"out_packageset": null,
60+
"release": {
61+
"major_version": 10,
62+
"minor_version": 0,
63+
"os_name": "{os_name}"
64+
}
65+
},
66+
{
67+
"action": 1,
68+
"architectures": [
69+
"x86_64"
70+
],
71+
"id": 5,
72+
"in_packageset": {
73+
"package": [
74+
{
75+
"modulestreams": [
76+
null
77+
],
78+
"name": "sysmonforlinux",
79+
"repository": "packages-microsoft-com-prod"
80+
}
81+
],
82+
"set_id": 6
83+
},
84+
"initial_release": {
85+
"major_version": 9,
86+
"minor_version": 0,
87+
"os_name": "{os_name}"
88+
},
89+
"modulestream_maps": [],
90+
"out_packageset": null,
91+
"release": {
92+
"major_version": 10,
93+
"minor_version": 0,
94+
"os_name": "{os_name}"
95+
}
96+
}
97+
],
98+
"provided_data_streams": [
99+
"4.0"
100+
],
101+
"timestamp": "202510131320Z"
102+
}

0 commit comments

Comments
 (0)