Skip to content

Commit 4f4d31f

Browse files
andrewlukoshkoandrewlukoshko
authored
Merge pull request #155 from yuravk/devel-ng-0.22.0-vendor-tuxcare
New vendor, tuxcare (data stream 3.x, leapp-repository 0.22.0)
2 parents cf73449 + 3803afb commit 4f4d31f

11 files changed

Lines changed: 238 additions & 4 deletions

‎.github/workflows/elevate.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,15 @@ jobs:
346346
res=$?
347347
fi
348348
349+
if [ "${vendor}" = "tuxcare" ]; then
350+
sudo dnf -y install https://repo.alt.tuxcare.com/alt-common/alt-common-release-install.x86_64.rpm
351+
sudo dnf -y install \
352+
alt-libgd \
353+
alt-openssl11-libs \
354+
alt-sqlite
355+
res=$?
356+
fi
357+
349358
if [ "${vendor}" = "imunify" ]; then
350359
# TODO prepare/install the repository config instead of changing vendor's one
351360
sudo cp -av /etc/leapp/files/vendors.d/imunify.repo /etc/yum.repos.d/
@@ -596,6 +605,11 @@ jobs:
596605
run: |
597606
sudo vagrant ssh elevatevm -c "sudo /vagrant/Vendors.sh microsoft ${{ env.source_release }}" || exit 1
598607
608+
- name: Vendor - TuxCare
609+
if: inputs.vendors == 'all'
610+
run: |
611+
sudo vagrant ssh elevatevm -c "sudo /vagrant/Vendors.sh tuxcare ${{ env.source_release }}" || exit 1
612+
599613
- name: Vendor - Imunify360
600614
if: inputs.vendors == 'all' && env.target_release == '8'
601615
run: |

‎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
9+
%define supported_vendors epel imunify kernelcare mariadb nginx-stable nginx-mainline postgresql docker-ce imunify360-alt-php tuxcare
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
26+
%define supported_vendors epel kernelcare mariadb nginx-stable nginx-mainline postgresql docker-ce tuxcare
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 docker-ce postgresql
43+
%define supported_vendors epel 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: 3%{?dist}.%{pes_events_build_date}
62+
Release: 4%{?dist}.%{pes_events_build_date}
6363
Summary: data for migrating tool
6464
Group: Applications/Databases
6565
License: ASL 2.0
@@ -171,6 +171,11 @@ python3 tests/check_debranding.py %{buildroot}%{_sysconfdir}/leapp/files/pes-eve
171171

172172

173173
%changelog
174+
175+
* Fri Jul 11 2025 Yuriy Kohut <ykohut@almalinux.org> - 0.9-4.20250505
176+
- New vendor, tuxcare
177+
- add alt-common repository - alt common Extended Lifecycle Support by TuxCare
178+
174179
* Wed May 28 2025 Yuriy Kohut <ykohut@almalinux.org> - 0.9-3.20250505
175180
- Add PostgreSQL Vendor for 9 to 10 upgrade
176181

‎vendors.d/rpm-gpg/tuxcare.gpg‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
-----BEGIN PGP PUBLIC KEY BLOCK-----
2+
3+
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
50+
Vlc/JR13EjTzcQFzQ/maq/9R
51+
=Vyx4
52+
-----END PGP PUBLIC KEY BLOCK-----

‎vendors.d/tuxcare.repo.el10‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[el10-alt-common]
2+
name = EL10 alt common Extended Lifecycle Support by TuxCare
3+
baseurl = https://repo.alt.tuxcare.com/alt-common/rpm/el/10/stable/$basearch/
4+
enabled=1
5+
gpgkey=file:///etc/leapp/files/vendors.d/rpm-gpg/tuxcare.gpg
6+
gpgcheck=1

‎vendors.d/tuxcare.repo.el8‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[el8-alt-common]
2+
name = EL8 alt common Extended Lifecycle Support by TuxCare
3+
baseurl = https://repo.alt.tuxcare.com/alt-common/rpm/el/8/stable/$basearch/
4+
enabled=1
5+
gpgkey=file:///etc/leapp/files/vendors.d/rpm-gpg/tuxcare.gpg
6+
gpgcheck=1

‎vendors.d/tuxcare.repo.el9‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[el9-alt-common]
2+
name = EL9 alt common Extended Lifecycle Support by TuxCare
3+
baseurl = https://repo.alt.tuxcare.com/alt-common/rpm/el/9/stable/$basearch/
4+
enabled=1
5+
gpgkey=file:///etc/leapp/files/vendors.d/rpm-gpg/tuxcare.gpg
6+
gpgcheck=1

‎vendors.d/tuxcare.sigs‎

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

‎vendors.d/tuxcare_map.json.el10‎

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

‎vendors.d/tuxcare_map.json.el8‎

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

‎vendors.d/tuxcare_map.json.el9‎

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

0 commit comments

Comments
 (0)