Skip to content

Commit 4892de6

Browse files
authored
Merge pull request #147 from yuravk/devel-ng-0.22.0
Add PostgreSQL Vendor for 9 to 10 upgrade. Update CI
2 parents 6dbf282 + 8943ac6 commit 4892de6

4 files changed

Lines changed: 386 additions & 5 deletions

File tree

.github/workflows/elevate.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ jobs:
100100
# ELevation to AlmaLinux 10 is available for testing and NG repositories
101101
[[ "${{ inputs.repository }}" == *"testing"* || "${{ inputs.repository }}" == *"NG"* ]] && \
102102
VARIANTS+=("almalinux 9 to almalinux 10")
103-
# ELevation to AlmaLinux Kitten 10 is available for NG repository
104-
[[ "${{ inputs.repository }}" == *"NG"* ]] && \
103+
# ELevation to AlmaLinux Kitten 10 is available for testing and NG repositories
104+
[[ "${{ inputs.repository }}" == *"testing"* || "${{ inputs.repository }}" == *"NG"* ]] && \
105105
VARIANTS+=("almalinux 9 to almalinux-kitten 10")
106106
fi
107107
fi
@@ -580,7 +580,7 @@ jobs:
580580
sudo vagrant ssh elevatevm -c "sudo /vagrant/Vendors.sh mariadb ${{ env.source_release }}" || exit 1
581581
582582
- name: Vendor - PostgreSQL
583-
if: inputs.vendors == 'all' && env.target_release != '10'
583+
if: inputs.vendors == 'all'
584584
run: |
585585
sudo vagrant ssh elevatevm -c "sudo /vagrant/Vendors.sh postgresql ${{ env.source_release }}" || exit 1
586586

leapp-data.spec

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
%endif
4141
%endif
4242
%if 0%{?rhel} == 9
43-
%define supported_vendors epel docker-ce
43+
%define supported_vendors epel docker-ce postgresql
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: 2%{?dist}.%{pes_events_build_date}
62+
Release: 3%{?dist}.%{pes_events_build_date}
6363
Summary: data for migrating tool
6464
Group: Applications/Databases
6565
License: ASL 2.0
@@ -171,6 +171,9 @@ python3 tests/check_debranding.py %{buildroot}%{_sysconfdir}/leapp/files/pes-eve
171171

172172

173173
%changelog
174+
* Wed May 28 2025 Yuriy Kohut <ykohut@almalinux.org> - 0.9-3.20250505
175+
- Add PostgreSQL Vendor for 9 to 10 upgrade
176+
174177
* Wed May 28 2025 Yuriy Kohut <ykohut@almalinux.org> - 0.9-2.20250505
175178
- ELevate to AlmaLinux 10.0 stable
176179

vendors.d/postgresql.repo.el10

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
#########################################################################
2+
# PGDG Red Hat Enterprise Linux / Rocky / AlmaLinux repositories. #
3+
#########################################################################
4+
5+
# PGDG Red Hat Enterprise Linux / Rocky / AlmaLinux stable common repository for all PostgreSQL versions
6+
7+
[el10-pgdg-common]
8+
name=PostgreSQL common RPMs for RHEL / Rocky / AlmaLinux 10 - $basearch
9+
baseurl=https://download.postgresql.org/pub/repos/yum/common/redhat/rhel-10-$basearch
10+
enabled=1
11+
gpgcheck=1
12+
gpgkey=file:///etc/leapp/files/vendors.d/rpm-gpg/postgresql.gpg
13+
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+
25+
# We provide extra package to support some RPMs in the PostgreSQL RPM repo, like
26+
# consul, haproxy, etc.
27+
28+
[el10-pgdg-rhel10-extras]
29+
name=Extra packages to support some RPMs in the PostgreSQL RPM repo RHEL / Rocky / AlmaLinux 10 - $basearch
30+
baseurl=https://download.postgresql.org/pub/repos/yum/common/pgdg-rhel10-extras/redhat/rhel-10-$basearch
31+
enabled=0
32+
gpgcheck=1
33+
gpgkey=file:///etc/leapp/files/vendors.d/rpm-gpg/postgresql.gpg
34+
35+
# PGDG Red Hat Enterprise Linux / Rocky / AlmaLinux stable repositories:
36+
37+
[el10-pgdg17]
38+
name=PostgreSQL 17 for RHEL / Rocky / AlmaLinux 10 - $basearch
39+
baseurl=https://download.postgresql.org/pub/repos/yum/17/redhat/rhel-10-$basearch
40+
enabled=1
41+
gpgcheck=1
42+
gpgkey=file:///etc/leapp/files/vendors.d/rpm-gpg/postgresql.gpg
43+
44+
[el10-pgdg16]
45+
name=PostgreSQL 16 for RHEL / Rocky / AlmaLinux 10 - $basearch
46+
baseurl=https://download.postgresql.org/pub/repos/yum/16/redhat/rhel-10-$basearch
47+
enabled=1
48+
gpgcheck=1
49+
gpgkey=file:///etc/leapp/files/vendors.d/rpm-gpg/postgresql.gpg
50+
51+
[el10-pgdg15]
52+
name=PostgreSQL 15 for RHEL / Rocky / AlmaLinux 10 - $basearch
53+
baseurl=https://download.postgresql.org/pub/repos/yum/15/redhat/rhel-10-$basearch
54+
enabled=1
55+
gpgcheck=1
56+
gpgkey=file:///etc/leapp/files/vendors.d/rpm-gpg/postgresql.gpg
57+
58+
[el10-pgdg14]
59+
name=PostgreSQL 14 for RHEL / Rocky / AlmaLinux 10 - $basearch
60+
baseurl=https://download.postgresql.org/pub/repos/yum/14/redhat/rhel-10-$basearch
61+
enabled=1
62+
gpgcheck=1
63+
gpgkey=file:///etc/leapp/files/vendors.d/rpm-gpg/postgresql.gpg
64+
65+
[el10-pgdg13]
66+
name=PostgreSQL 13 for RHEL / Rocky / AlmaLinux 10 - $basearch
67+
baseurl=https://download.postgresql.org/pub/repos/yum/13/redhat/rhel-10-$basearch
68+
enabled=1
69+
gpgcheck=1
70+
gpgkey=file:///etc/leapp/files/vendors.d/rpm-gpg/postgresql.gpg

0 commit comments

Comments
 (0)