Skip to content

Commit b76f8ac

Browse files
rjd15372surbhat1595
rjd15372
authored and
surbhat1595
committed
ppg:staging: pin fork servers to the PSP-X.Y.Z release tags
The Percona fork tagged the new releases as PSP-16.15.1 / PSP-17.11.1 / PSP-18.6.1 instead of the release-X.Y.Z naming used up to 17.10.2 / 18.4.2, so the revision form introduced with PERCONA_PG_PATCH_VERSION (release-%!{PG_VERSION}.%!{PERCONA_PG_PATCH_VERSION}) keeps resolving to the release-* *branches* and would never pin itself to a tag. Switch staging/17, staging/18 and staging/16/tde to PSP-%!{PG_VERSION}.%!{PERCONA_PG_PATCH_VERSION}. Each PSP tag currently points at the exact head of the corresponding release-* branch (PSP-16.15.1 = c0d38ac6, PSP-17.11.1 = d2798ace, PSP-18.6.1 = 19c3033d), so the built source is unchanged; the revision just stops being a moving ref, as a staging tier expects. Signed-off-by: Ricardo Dias <ricardo.dias@percona.com>
1 parent 80fe8c6 commit b76f8ac

38 files changed

Lines changed: 177 additions & 119 deletions

File tree

‎root/ppg/staging/16/tde/percona-postgresql/obs/_service‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<service name="obs_scm">
33
<param name="url">https://github.com/percona/postgres.git</param>
44
<param name="scm">git</param>
5-
<param name="revision">release-%!{PG_VERSION}.%!{PERCONA_PG_PATCH_VERSION}</param>
5+
<param name="revision">PSP-%!{PG_VERSION}.%!{PERCONA_PG_PATCH_VERSION}</param>
66
<param name="version">%!{PG_VERSION}</param>
77
<param name="filename">percona-postgresql</param>
88
</service>

‎root/ppg/staging/17/percona-patroni/debian/control‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Homepage: https://github.com/patroni/patroni
4242

4343
Package: percona-patroni
4444
Architecture: all
45-
Depends: ${misc:Depends}, ${python3:Depends}, lsb-base (>= 3.0-6), python3-psycopg2 , python3-etcd, python3-consul | python3-kazoo | python3-kubernetes, python-six | python3-six, python-requests | python3-requests, python-yaml | python3-yaml, python3-dateutil, python3-yaml, python3-psutil, python3-prettytable, python3-click, python3-cdiff, python3-ydiff, python3-pysyncobj, percona-postgresql-17 | postgresql-17
45+
Depends: ${misc:Depends}, ${python3:Depends}, lsb-base (>= 3.0-6), python3-psycopg2 , python3-etcd, python3-consul | python3-kazoo | python3-kubernetes, python-six | python3-six, python-requests | python3-requests, python-yaml | python3-yaml, python3-dateutil, python3-yaml, python3-psutil, python3-prettytable, python3-click, python3-cdiff, python3-ydiff, python3-pysyncobj, python3-systemd, percona-postgresql-17 | postgresql-17
4646
Suggests: etcd-server | consul | zookeeperd, haproxy, percona-patroni-doc
4747
Provides: patroni
4848
Description: PostgreSQL High Availability with ZooKeeper, etcd, Consul, or Kubernetes

‎root/ppg/staging/17/percona-patroni/rpm/percona-patroni.spec‎

Lines changed: 41 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,17 @@
11

22
%global debug_package %{nil}
33

4-
%if 0%{?fedora} && 0%{?fedora} == 43
5-
%global __ospython %{_bindir}/python3.14
6-
%global python3_pkgversion 3.14
4+
%if 0%{?fedora} && 0%{?fedora} == 45
5+
%global __ospython %{_bindir}/python3.15
6+
%global python3_pkgversion 3.15
77
%global python3_pkgprefix python3
88
%endif
9-
%if 0%{?fedora} && 0%{?fedora} <= 42
10-
%global __ospython %{_bindir}/python3.13
11-
%global python3_pkgversion 3.13
9+
%if 0%{?fedora} && 0%{?fedora} <= 44
10+
%global __ospython %{_bindir}/python3.14
11+
%global python3_pkgversion 3.14
1212
%global python3_pkgprefix python3
1313
%endif
14-
%if 0%{?rhel} && 0%{?rhel} == 8
15-
%global __ospython %{_bindir}/python3
16-
%global python3_pkgversion 3.12
17-
%global python3_pkgprefix python3.12
18-
%endif
19-
%if 0%{?rhel} && 0%{?rhel} >= 9
14+
%if 0%{?rhel} && 0%{?rhel} <= 10
2015
%global __ospython %{_bindir}/python3.12
2116
%global python3_pkgversion 3.12
2217
%global python3_pkgprefix python3.12
@@ -51,12 +46,13 @@ BuildRequires: python%{python3_pkgversion}-devel
5146

5247
Requires: %{python3_pkgprefix}-six
5348
Requires: %{python3_pkgprefix}-dateutil
49+
Requires: %{python3_pkgprefix}-systemd
5450
Requires: %{python3_pkgprefix}-ydiff < 1.5
5551
Requires: %{python3_pkgprefix}-ydiff >= 1.4.2
5652
Requires: %{name}-etcd
5753

5854

59-
%if !0%{?suse_version}
55+
%if !0%{?suse_version} && 0%{?rhel} != 10
6056
Requires: %{python3_pkgprefix}-click
6157
Requires: %{python3_pkgprefix}-cryptography >= 1.4
6258
Requires: %{python3_pkgprefix}-prettytable
@@ -67,6 +63,17 @@ Requires: %{python3_pkgprefix}-urllib3 >= 1.19.1
6763
Requires: %{python3_pkgprefix}-wcwidth
6864
%endif
6965

66+
%if 0%{?rhel} && 0%{?rhel} == 10
67+
Requires: python3-click
68+
Requires: python%{python3_pkgversion}-cryptography >= 1.4
69+
Requires: python3-prettytable
70+
Requires: python%{python3_pkgversion}-pyyaml
71+
Requires: python3-psutil
72+
Requires: python%{python3_pkgversion}-urllib3 >= 1.19.1
73+
Requires: python3-psycopg2
74+
Requires: python3-wcwidth
75+
%endif
76+
7077
%if 0%{?suse_version} >= 1500
7178
Requires: %{python3_pkgprefix}-click
7279
Requires: %{python3_pkgprefix}-cryptography >= 1.4
@@ -100,18 +107,28 @@ Summary: Related components to use patroni with Consul
100107
Requires: %{name} = %{epoch}:%{version}-%{release}
101108
Requires: consul
102109
Requires: %{python3_pkgprefix}-py-consul >= 1.6.0
110+
%if 0%{?rhel} != 10
103111
Requires: %{python3_pkgprefix}-requests
112+
%endif
113+
%if 0%{?rhel} && 0%{?rhel} == 10
114+
Requires: python3-requests
115+
%endif
104116
%description -n %{name}-consul
105117
Meta package to pull consul related dependencies for patroni
106118

107119
%package -n %{name}-etcd
108120
Summary: Related components to use patroni with etcd
109121
Requires: %{name} = %{epoch}:%{version}-%{release}
110-
%if !0%{?suse_version}
122+
%if !0%{?suse_version} && 0%{?rhel} != 10
111123
Requires: %{python3_pkgprefix}-etcd >= 0.4.3
112124
Requires: %{python3_pkgprefix}-dns
113125
%endif
126+
%if 0%{?rhel} && 0%{?rhel} == 10
127+
Requires: python3-etcd >= 0.4.3
128+
Requires: python3-dns
129+
%endif
114130
%if 0%{?suse_version} >= 1500
131+
Requires: %{python3_pkgprefix}-etcd >= 0.4.3
115132
Requires: %{python3_pkgprefix}-dnspython
116133
%endif
117134
%description -n %{name}-etcd
@@ -120,14 +137,24 @@ Meta package to pull etcd related dependencies for patroni
120137
%package -n %{name}-aws
121138
Summary: Related components to use patroni on AWS
122139
Requires: %{name} = %{epoch}:%{version}-%{release}
140+
%if 0%{?rhel} != 10
123141
Requires: %{python3_pkgprefix}-boto3
142+
%endif
143+
%if 0%{?rhel} && 0%{?rhel} == 10
144+
Requires: python3-boto3
145+
%endif
124146
%description -n %{name}-aws
125147
Meta package to pull AWS related dependencies for patroni
126148

127149
%package -n %{name}-zookeeper
128150
Summary: Related components to use patroni with Zookeeper
129151
Requires: %{name} = %{epoch}:%{version}-%{release}
152+
%if 0%{?rhel} != 10
130153
Requires: %{python3_pkgprefix}-kazoo >= 1.3.1
154+
%endif
155+
%if 0%{?rhel} && 0%{?rhel} == 10
156+
Requires: python3-kazoo >= 1.3.1
157+
%endif
131158
%description -n %{name}-zookeeper
132159
Meta package to pull zookeeper related dependencies for patroni
133160

‎root/ppg/staging/17/percona-pg-telemetry/debian/control‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ Build-Depends:
99
Package: percona-pg-telemetry%!{PG_MAJOR_VERSION}
1010
Architecture: any
1111
Depends:
12-
percona-telemetry-agent,
1312
${misc:Depends},
1413
${shlibs:Depends},
1514
Description:The percona_pg_telemetry is an extension for Percona telemetry data collection for PostgreSQL.

‎root/ppg/staging/17/percona-pg-telemetry/debian/control.in‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ Build-Depends:
99
Package: percona-pg-telemetry17
1010
Architecture: any
1111
Depends:
12-
percona-telemetry-agent,
1312
${misc:Depends},
1413
${shlibs:Depends},
1514
Description:The percona_pg_telemetry is an extension for Percona telemetry data collection for PostgreSQL.

‎root/ppg/staging/17/percona-pg-telemetry/debian/postinst‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
#!/bin/sh
22

33
#DEBHELPER#
4-
usermod -a -G percona-telemetry postgres
54

6-
mkdir /usr/local/percona/telemetry/pg
7-
chown postgres:percona-telemetry /usr/local/percona/telemetry/pg
8-
chmod 775 /usr/local/percona/telemetry/pg
9-
chmod g+s /usr/local/percona/telemetry/pg
10-
chmod u+s /usr/local/percona/telemetry/pg
11-
exit 0
5+
# Transitional cleanup: percona-pg-telemetry <= 1.1 managed this dir for the
6+
# telemetry-agent. The extension no longer uses it. Remove in a future release.
7+
if [ -d /usr/local/percona/telemetry/pg ] && [ -z "$(ls -A /usr/local/percona/telemetry/pg 2>/dev/null)" ]; then
8+
rmdir /usr/local/percona/telemetry/pg 2>/dev/null || true
9+
fi
1210

11+
exit 0

‎root/ppg/staging/17/percona-pg-telemetry/debian/postrm‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,8 @@ fi
2222

2323
case "$1" in
2424
remove | purge)
25-
set -e
26-
PG_TELEMETRY=/usr/local/percona/telemetry/pg
27-
if [ -d ${PG_TELEMETRY} ];
28-
then
29-
rm -rf ${PG_TELEMETRY}
30-
fi
31-
32-
set +e
33-
25+
# The extension no longer owns /usr/local/percona/telemetry/pg.
26+
# Leftover empty dirs from <= 1.1 are cleaned in postinst.
3427
;;
3528

3629
upgrade | failed-upgrade | abort-install | abort-upgrade | disappear)

‎root/ppg/staging/17/percona-pg-telemetry/rpm/percona-pg-telemetry.spec‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ BuildRequires: gcc-toolset-%{gts_version}-gcc gcc-toolset-%{gts_version}-gcc-c+
3232
BuildRequires: chrpath
3333
%endif
3434

35-
Requires: percona-telemetry-agent
3635
Conflicts: %{sname}%{pgrel}
3736
Obsoletes: %{sname}%{pgrel} <= %{version}-%{release}
3837
Epoch: 1
@@ -80,19 +79,17 @@ if [ $1 == 1 ]; then
8079
fi
8180

8281
%post -n %{sname}%{pgrel}
83-
if getent group percona-telemetry > /dev/null 2>&1; then
84-
usermod -a -G percona-telemetry postgres || :
85-
install -d -m 2775 -o postgres -g percona-telemetry /usr/local/percona/telemetry/pg || :
86-
else
87-
install -d -m 2775 -o postgres -g postgres /usr/local/percona/telemetry/pg || :
82+
# Transitional cleanup: percona-pg-telemetry <= 1.1 managed this dir for the
83+
# telemetry-agent. The extension no longer uses it. Remove in a future release.
84+
if [ -d /usr/local/percona/telemetry/pg ] && [ -z "$(ls -A /usr/local/percona/telemetry/pg 2>/dev/null)" ]; then
85+
rmdir /usr/local/percona/telemetry/pg 2>/dev/null || :
8886
fi
8987
%if 0%{?suse_version}
9088
# Update dynamic linker cache for new library path
9189
/sbin/ldconfig
9290
%endif
9391

9492
%postun -n %{sname}%{pgrel}
95-
rm -rf /usr/local/percona/telemetry/pg
9693
%if 0%{?suse_version}
9794
# Update dynamic linker cache after package removal
9895
/sbin/ldconfig

‎root/ppg/staging/17/percona-pg_cron/rpm/pg_cron.spec‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,12 @@ Requires: postgresql%{pgmajorversion}-server
3333
Requires(post): %{_sbindir}/update-alternatives
3434
Requires(postun): %{_sbindir}/update-alternatives
3535

36-
%if 0%{?suse_version} >= 1315 && 0%{?suse_version} <= 1499
37-
Requires: libopenssl1_0_0
38-
%else
3936
%if 0%{?suse_version} >= 1500
40-
Requires: libopenssl1_1
41-
%else
42-
Requires: openssl-libs >= 1.0.2k
43-
%endif
37+
Requires: libopenssl3
38+
BuildRequires: libopenssl-3-devel
4439
%endif
45-
46-
%if 0%{?suse_version} >= 1315 && 0%{?suse_version} <= 1499
47-
BuildRequires: libopenssl-devel
48-
%else
40+
%if 0%{?fedora} >= 41 || 0%{?rhel} >= 8
41+
Requires: openssl-libs >= 1.1.1k
4942
BuildRequires: openssl-devel
5043
%endif
5144

‎root/ppg/staging/17/percona-pgbackrest/debian/control‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ Build-Depends: debhelper-compat (= 13),
99
libpq-dev,
1010
libssh2-1-dev,
1111
libssl-dev,
12+
libsystemd-dev,
1213
libxml-checker-perl,
1314
libxml2-dev,
1415
libyaml-dev,

0 commit comments

Comments
 (0)