Skip to content

Commit c0ff936

Browse files
eabdullin1eabdullin1
authored
Merge pull request #180 from yuravk/devel-ng-0.22.0
Correct vendor PostgreSQL repositories [Data stream 4.0, EL8 and EL9 packages]
2 parents d43182b + 93a94be commit c0ff936

7 files changed

Lines changed: 10 additions & 93 deletions

File tree

‎.github/workflows/elevate.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,8 @@ jobs:
387387
case ${source_release} in
388388
7)
389389
sudo dnf -y -q install epel-release;;
390+
# TODO: switch "PostgreSQL 12 for RHEL / CentOS" repository into yum-archive.postgresql.org
391+
sed -i 's#download.postgresql.org/pub/repos/yum/12/#yum-archive.postgresql.org/12/#g' /etc/yum.repos.d/pgdg-redhat-all.repo
390392
8)
391393
sudo dnf -y -q module disable postgresql;;
392394
esac

‎leapp-data.spec‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747

4848
Name: leapp-data-%{dist_name}
4949
Version: 0.10
50-
Release: 8%{?dist}.%{pes_events_build_date}
50+
Release: 9%{?dist}.%{pes_events_build_date}
5151
Summary: data for migrating tool
5252
Group: Applications/Databases
5353
License: ASL 2.0
@@ -159,6 +159,11 @@ python3 tests/check_debranding.py %{buildroot}%{_sysconfdir}/leapp/files/pes-eve
159159

160160

161161
%changelog
162+
* Mon Jan 19 2026 Yuriy Kohut <[email protected]> - 0.10-9.20250729
163+
- Vendor PostgreSQL:
164+
- remove Supplementary ucommon RPMs (sysupdates) repositories
165+
- switch "PostgreSQL 12 for RHEL / CentOS" repositories into yum-archive.postgresql.org
166+
162167
* Wed Nov 26 2025 Yuriy Kohut <[email protected]> - 0.10-8.20250729
163168
- Vendor PostgreSQL: correct extras repository base url
164169

‎vendors.d/postgresql.repo.el10‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,6 @@ enabled=1
1111
gpgcheck=1
1212
gpgkey=file:///etc/leapp/files/vendors.d/rpm-gpg/postgresql.gpg
1313

14-
# Red Hat recently breaks compatibility between 8.n and 8.n+1. PGDG repo is
15-
# affected with the LLVM packages. This is a band aid repo for the llvmjit users
16-
# whose installations cannot be updated.
17-
18-
# [el10-pgdg-rocky10-sysupdates]
19-
# name=PostgreSQL Supplementary ucommon RPMs for RHEL / Rocky / AlmaLinux 10 - $basearch
20-
# baseurl=https://download.postgresql.org/pub/repos/yum/common/pgdg-rocky10-sysupdates/redhat/rhel-10-x86_64
21-
# enabled=0
22-
# gpgcheck=1
23-
# gpgkey=file:///etc/leapp/files/vendors.d/rpm-gpg/postgresql.gpg
24-
2514
# We provide extra package to support some RPMs in the PostgreSQL RPM repo, like
2615
# consul, haproxy, etc.
2716

‎vendors.d/postgresql.repo.el8‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,6 @@ gpgcheck=1
1212
gpgkey=file:///etc/leapp/files/vendors.d/rpm-gpg/postgresql.gpg
1313
module_hotfixes=true
1414

15-
16-
# Red Hat recently breaks compatibility between 8.n and 8.n+1. PGDG repo is
17-
# affected with the LLVM packages. This is a band aid repo for the llvmjit users
18-
# whose installations cannot be updated.
19-
20-
[el8-pgdg-centos8-sysupdates]
21-
name=PostgreSQL Supplementary ucommon RPMs for RHEL / Rocky 8 - $basearch
22-
baseurl=https://download.postgresql.org/pub/repos/yum/common/pgdg-centos8-sysupdates/redhat/rhel-8-$basearch
23-
enabled=0
24-
gpgcheck=1
25-
gpgkey=file:///etc/leapp/files/vendors.d/rpm-gpg/postgresql.gpg
26-
module_hotfixes=true
27-
28-
2915
# We provide extra package to support some RPMs in the PostgreSQL RPM repo, like
3016
# consul, haproxy, etc.
3117

@@ -69,7 +55,7 @@ module_hotfixes=true
6955

7056
[el8-pgdg12]
7157
name=PostgreSQL 12 for RHEL / Rocky 8 - $basearch
72-
baseurl=https://download.postgresql.org/pub/repos/yum/12/redhat/rhel-8-$basearch
58+
baseurl=https://yum-archive.postgresql.org/12/redhat/rhel-8-$basearch
7359
enabled=1
7460
gpgcheck=1
7561
gpgkey=file:///etc/leapp/files/vendors.d/rpm-gpg/postgresql.gpg

‎vendors.d/postgresql.repo.el9‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,6 @@ enabled=1
1111
gpgcheck=1
1212
gpgkey=file:///etc/leapp/files/vendors.d/rpm-gpg/postgresql.gpg
1313

14-
# Red Hat recently breaks compatibility between 8.n and 8.n+1. PGDG repo is
15-
# affected with the LLVM packages. This is a band aid repo for the llvmjit users
16-
# whose installations cannot be updated.
17-
18-
[el9-pgdg-rocky9-sysupdates]
19-
name=PostgreSQL Supplementary ucommon RPMs for RHEL / Rocky / AlmaLinux 9 - $basearch
20-
baseurl=https://download.postgresql.org/pub/repos/yum/common/pgdg-rocky9-sysupdates/redhat/rhel-9-x86_64
21-
enabled=0
22-
gpgcheck=1
23-
gpgkey=file:///etc/leapp/files/vendors.d/rpm-gpg/postgresql.gpg
24-
2514
# We provide extra package to support some RPMs in the PostgreSQL RPM repo, like
2615
# consul, haproxy, etc.
2716

@@ -71,7 +60,7 @@ gpgkey=file:///etc/leapp/files/vendors.d/rpm-gpg/postgresql.gpg
7160

7261
[el9-pgdg12]
7362
name=PostgreSQL 12 for RHEL / Rocky / AlmaLinux 9 - $basearch
74-
baseurl=https://download.postgresql.org/pub/repos/yum/12/redhat/rhel-9-$basearch
63+
baseurl=https://yum-archive.postgresql.org/12/redhat/rhel-9-$basearch
7564
enabled=1
7665
gpgcheck=1
7766
gpgkey=file:///etc/leapp/files/vendors.d/rpm-gpg/postgresql.gpg

‎vendors.d/postgresql_map.json_template.el8‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -16,39 +16,34 @@
1616
"source": "pgdg15",
1717
"target": [
1818
"el8-pgdg15",
19-
"el8-pgdg-centos8-sysupdates",
2019
"el8-pgdg-rhel8-extras"
2120
]
2221
},
2322
{
2423
"source": "pgdg14",
2524
"target": [
2625
"el8-pgdg14",
27-
"el8-pgdg-centos8-sysupdates",
2826
"el8-pgdg-rhel8-extras"
2927
]
3028
},
3129
{
3230
"source": "pgdg13",
3331
"target": [
3432
"el8-pgdg13",
35-
"el8-pgdg-centos8-sysupdates",
3633
"el8-pgdg-rhel8-extras"
3734
]
3835
},
3936
{
4037
"source": "pgdg12",
4138
"target": [
4239
"el8-pgdg12",
43-
"el8-pgdg-centos8-sysupdates",
4440
"el8-pgdg-rhel8-extras"
4541
]
4642
},
4743
{
4844
"source": "pgdg11",
4945
"target": [
5046
"el8-pgdg11",
51-
"el8-pgdg-centos8-sysupdates",
5247
"el8-pgdg-rhel8-extras"
5348
]
5449
}
@@ -404,35 +399,6 @@
404399
}
405400
]
406401
},
407-
{
408-
"pesid": "el8-pgdg-centos8-sysupdates",
409-
"entries": [
410-
{
411-
"major_version": "8",
412-
"repoid": "el8-pgdg-centos8-sysupdates",
413-
"arch": "x86_64",
414-
"channel": "ga",
415-
"repo_type": "rpm",
416-
"distro": "{distro}"
417-
},
418-
{
419-
"major_version": "8",
420-
"repoid": "el8-pgdg-centos8-sysupdates",
421-
"arch": "aarch64",
422-
"channel": "ga",
423-
"repo_type": "rpm",
424-
"distro": "{distro}"
425-
},
426-
{
427-
"major_version": "8",
428-
"repoid": "el8-pgdg-centos8-sysupdates",
429-
"arch": "ppc64le",
430-
"channel": "ga",
431-
"repo_type": "rpm",
432-
"distro": "{distro}"
433-
}
434-
]
435-
},
436402
{
437403
"pesid": "el8-pgdg-rhel8-extras",
438404
"entries": [

‎vendors.d/postgresql_map.json_template.el9‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,55 +16,48 @@
1616
"source": "pgdg17",
1717
"target": [
1818
"el9-pgdg17",
19-
"el9-pgdg-rocky9-sysupdates",
2019
"el9-pgdg-rhel9-extras"
2120
]
2221
},
2322
{
2423
"source": "pgdg16",
2524
"target": [
2625
"el9-pgdg16",
27-
"el9-pgdg-rocky9-sysupdates",
2826
"el9-pgdg-rhel9-extras"
2927
]
3028
},
3129
{
3230
"source": "pgdg15",
3331
"target": [
3432
"el9-pgdg15",
35-
"el9-pgdg-rocky9-sysupdates",
3633
"el9-pgdg-rhel9-extras"
3734
]
3835
},
3936
{
4037
"source": "pgdg14",
4138
"target": [
4239
"el9-pgdg14",
43-
"el9-pgdg-rocky9-sysupdates",
4440
"el9-pgdg-rhel9-extras"
4541
]
4642
},
4743
{
4844
"source": "pgdg13",
4945
"target": [
5046
"el9-pgdg13",
51-
"el9-pgdg-rocky9-sysupdates",
5247
"el9-pgdg-rhel9-extras"
5348
]
5449
},
5550
{
5651
"source": "pgdg12",
5752
"target": [
5853
"el9-pgdg12",
59-
"el9-pgdg-rocky9-sysupdates",
6054
"el9-pgdg-rhel9-extras"
6155
]
6256
},
6357
{
6458
"source": "pgdg11",
6559
"target": [
6660
"el9-pgdg11",
67-
"el9-pgdg-rocky9-sysupdates",
6861
"el9-pgdg-rhel9-extras"
6962
]
7063
}
@@ -464,19 +457,6 @@
464457
}
465458
]
466459
},
467-
{
468-
"pesid": "el9-pgdg-rocky9-sysupdates",
469-
"entries": [
470-
{
471-
"major_version": "9",
472-
"repoid": "el9-pgdg-rocky9-sysupdates",
473-
"arch": "x86_64",
474-
"channel": "ga",
475-
"repo_type": "rpm",
476-
"distro": "{distro}"
477-
}
478-
]
479-
},
480460
{
481461
"pesid": "el9-pgdg-rhel9-extras",
482462
"entries": [

0 commit comments

Comments
 (0)