diff --git a/.github/workflows/elevate.yml b/.github/workflows/elevate.yml index 19d9927..59e5789 100644 --- a/.github/workflows/elevate.yml +++ b/.github/workflows/elevate.yml @@ -387,6 +387,8 @@ jobs: case ${source_release} in 7) sudo dnf -y -q install epel-release;; + # TODO: switch "PostgreSQL 12 for RHEL / CentOS" repository into yum-archive.postgresql.org + sed -i 's#download.postgresql.org/pub/repos/yum/12/#yum-archive.postgresql.org/12/#g' /etc/yum.repos.d/pgdg-redhat-all.repo 8) sudo dnf -y -q module disable postgresql;; esac diff --git a/leapp-data.spec b/leapp-data.spec index debdb13..817c99e 100644 --- a/leapp-data.spec +++ b/leapp-data.spec @@ -47,7 +47,7 @@ Name: leapp-data-%{dist_name} Version: 0.10 -Release: 8%{?dist}.%{pes_events_build_date} +Release: 9%{?dist}.%{pes_events_build_date} Summary: data for migrating tool Group: Applications/Databases License: ASL 2.0 @@ -159,6 +159,11 @@ python3 tests/check_debranding.py %{buildroot}%{_sysconfdir}/leapp/files/pes-eve %changelog +* Mon Jan 19 2026 Yuriy Kohut - 0.10-9.20250729 +- Vendor PostgreSQL: + - remove Supplementary ucommon RPMs (sysupdates) repositories + - switch "PostgreSQL 12 for RHEL / CentOS" repositories into yum-archive.postgresql.org + * Wed Nov 26 2025 Yuriy Kohut - 0.10-8.20250729 - Vendor PostgreSQL: correct extras repository base url diff --git a/vendors.d/postgresql.repo.el10 b/vendors.d/postgresql.repo.el10 index 943e1bf..5c5bdc2 100644 --- a/vendors.d/postgresql.repo.el10 +++ b/vendors.d/postgresql.repo.el10 @@ -11,17 +11,6 @@ enabled=1 gpgcheck=1 gpgkey=file:///etc/leapp/files/vendors.d/rpm-gpg/postgresql.gpg -# Red Hat recently breaks compatibility between 8.n and 8.n+1. PGDG repo is -# affected with the LLVM packages. This is a band aid repo for the llvmjit users -# whose installations cannot be updated. - -# [el10-pgdg-rocky10-sysupdates] -# name=PostgreSQL Supplementary ucommon RPMs for RHEL / Rocky / AlmaLinux 10 - $basearch -# baseurl=https://download.postgresql.org/pub/repos/yum/common/pgdg-rocky10-sysupdates/redhat/rhel-10-x86_64 -# enabled=0 -# gpgcheck=1 -# gpgkey=file:///etc/leapp/files/vendors.d/rpm-gpg/postgresql.gpg - # We provide extra package to support some RPMs in the PostgreSQL RPM repo, like # consul, haproxy, etc. diff --git a/vendors.d/postgresql.repo.el8 b/vendors.d/postgresql.repo.el8 index 7082bb4..a4c5212 100644 --- a/vendors.d/postgresql.repo.el8 +++ b/vendors.d/postgresql.repo.el8 @@ -12,20 +12,6 @@ gpgcheck=1 gpgkey=file:///etc/leapp/files/vendors.d/rpm-gpg/postgresql.gpg module_hotfixes=true - -# Red Hat recently breaks compatibility between 8.n and 8.n+1. PGDG repo is -# affected with the LLVM packages. This is a band aid repo for the llvmjit users -# whose installations cannot be updated. - -[el8-pgdg-centos8-sysupdates] -name=PostgreSQL Supplementary ucommon RPMs for RHEL / Rocky 8 - $basearch -baseurl=https://download.postgresql.org/pub/repos/yum/common/pgdg-centos8-sysupdates/redhat/rhel-8-$basearch -enabled=0 -gpgcheck=1 -gpgkey=file:///etc/leapp/files/vendors.d/rpm-gpg/postgresql.gpg -module_hotfixes=true - - # We provide extra package to support some RPMs in the PostgreSQL RPM repo, like # consul, haproxy, etc. @@ -69,7 +55,7 @@ module_hotfixes=true [el8-pgdg12] name=PostgreSQL 12 for RHEL / Rocky 8 - $basearch -baseurl=https://download.postgresql.org/pub/repos/yum/12/redhat/rhel-8-$basearch +baseurl=https://yum-archive.postgresql.org/12/redhat/rhel-8-$basearch enabled=1 gpgcheck=1 gpgkey=file:///etc/leapp/files/vendors.d/rpm-gpg/postgresql.gpg diff --git a/vendors.d/postgresql.repo.el9 b/vendors.d/postgresql.repo.el9 index f8eb629..3d3605f 100644 --- a/vendors.d/postgresql.repo.el9 +++ b/vendors.d/postgresql.repo.el9 @@ -11,17 +11,6 @@ enabled=1 gpgcheck=1 gpgkey=file:///etc/leapp/files/vendors.d/rpm-gpg/postgresql.gpg -# Red Hat recently breaks compatibility between 8.n and 8.n+1. PGDG repo is -# affected with the LLVM packages. This is a band aid repo for the llvmjit users -# whose installations cannot be updated. - -[el9-pgdg-rocky9-sysupdates] -name=PostgreSQL Supplementary ucommon RPMs for RHEL / Rocky / AlmaLinux 9 - $basearch -baseurl=https://download.postgresql.org/pub/repos/yum/common/pgdg-rocky9-sysupdates/redhat/rhel-9-x86_64 -enabled=0 -gpgcheck=1 -gpgkey=file:///etc/leapp/files/vendors.d/rpm-gpg/postgresql.gpg - # We provide extra package to support some RPMs in the PostgreSQL RPM repo, like # consul, haproxy, etc. @@ -71,7 +60,7 @@ gpgkey=file:///etc/leapp/files/vendors.d/rpm-gpg/postgresql.gpg [el9-pgdg12] name=PostgreSQL 12 for RHEL / Rocky / AlmaLinux 9 - $basearch -baseurl=https://download.postgresql.org/pub/repos/yum/12/redhat/rhel-9-$basearch +baseurl=https://yum-archive.postgresql.org/12/redhat/rhel-9-$basearch enabled=1 gpgcheck=1 gpgkey=file:///etc/leapp/files/vendors.d/rpm-gpg/postgresql.gpg diff --git a/vendors.d/postgresql_map.json_template.el8 b/vendors.d/postgresql_map.json_template.el8 index c43947c..1b32cb0 100644 --- a/vendors.d/postgresql_map.json_template.el8 +++ b/vendors.d/postgresql_map.json_template.el8 @@ -16,7 +16,6 @@ "source": "pgdg15", "target": [ "el8-pgdg15", - "el8-pgdg-centos8-sysupdates", "el8-pgdg-rhel8-extras" ] }, @@ -24,7 +23,6 @@ "source": "pgdg14", "target": [ "el8-pgdg14", - "el8-pgdg-centos8-sysupdates", "el8-pgdg-rhel8-extras" ] }, @@ -32,7 +30,6 @@ "source": "pgdg13", "target": [ "el8-pgdg13", - "el8-pgdg-centos8-sysupdates", "el8-pgdg-rhel8-extras" ] }, @@ -40,7 +37,6 @@ "source": "pgdg12", "target": [ "el8-pgdg12", - "el8-pgdg-centos8-sysupdates", "el8-pgdg-rhel8-extras" ] }, @@ -48,7 +44,6 @@ "source": "pgdg11", "target": [ "el8-pgdg11", - "el8-pgdg-centos8-sysupdates", "el8-pgdg-rhel8-extras" ] } @@ -404,35 +399,6 @@ } ] }, - { - "pesid": "el8-pgdg-centos8-sysupdates", - "entries": [ - { - "major_version": "8", - "repoid": "el8-pgdg-centos8-sysupdates", - "arch": "x86_64", - "channel": "ga", - "repo_type": "rpm", - "distro": "{distro}" - }, - { - "major_version": "8", - "repoid": "el8-pgdg-centos8-sysupdates", - "arch": "aarch64", - "channel": "ga", - "repo_type": "rpm", - "distro": "{distro}" - }, - { - "major_version": "8", - "repoid": "el8-pgdg-centos8-sysupdates", - "arch": "ppc64le", - "channel": "ga", - "repo_type": "rpm", - "distro": "{distro}" - } - ] - }, { "pesid": "el8-pgdg-rhel8-extras", "entries": [ diff --git a/vendors.d/postgresql_map.json_template.el9 b/vendors.d/postgresql_map.json_template.el9 index 96153ee..8b6496c 100644 --- a/vendors.d/postgresql_map.json_template.el9 +++ b/vendors.d/postgresql_map.json_template.el9 @@ -16,7 +16,6 @@ "source": "pgdg17", "target": [ "el9-pgdg17", - "el9-pgdg-rocky9-sysupdates", "el9-pgdg-rhel9-extras" ] }, @@ -24,7 +23,6 @@ "source": "pgdg16", "target": [ "el9-pgdg16", - "el9-pgdg-rocky9-sysupdates", "el9-pgdg-rhel9-extras" ] }, @@ -32,7 +30,6 @@ "source": "pgdg15", "target": [ "el9-pgdg15", - "el9-pgdg-rocky9-sysupdates", "el9-pgdg-rhel9-extras" ] }, @@ -40,7 +37,6 @@ "source": "pgdg14", "target": [ "el9-pgdg14", - "el9-pgdg-rocky9-sysupdates", "el9-pgdg-rhel9-extras" ] }, @@ -48,7 +44,6 @@ "source": "pgdg13", "target": [ "el9-pgdg13", - "el9-pgdg-rocky9-sysupdates", "el9-pgdg-rhel9-extras" ] }, @@ -56,7 +51,6 @@ "source": "pgdg12", "target": [ "el9-pgdg12", - "el9-pgdg-rocky9-sysupdates", "el9-pgdg-rhel9-extras" ] }, @@ -64,7 +58,6 @@ "source": "pgdg11", "target": [ "el9-pgdg11", - "el9-pgdg-rocky9-sysupdates", "el9-pgdg-rhel9-extras" ] } @@ -464,19 +457,6 @@ } ] }, - { - "pesid": "el9-pgdg-rocky9-sysupdates", - "entries": [ - { - "major_version": "9", - "repoid": "el9-pgdg-rocky9-sysupdates", - "arch": "x86_64", - "channel": "ga", - "repo_type": "rpm", - "distro": "{distro}" - } - ] - }, { "pesid": "el9-pgdg-rhel9-extras", "entries": [