Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commita454bd7

Browse files
committed
[ci skip] improve packaging:
* adding testing of packages for PG-14* updating postgres versions* adding reprepro config and rpmmacros to git* fixing forgotten rhel repo signing and package testing* adding alt-8 package testing* removing debian-8, ubuntu-14.04 and ubuntu-16.04 packaging* s/PGPRO Standart/PGPRO Standard/g
1 parent58a5805 commita454bd7

32 files changed

+771
-389
lines changed

‎packaging/Makefile.pkg

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ifeq ($(PBK_EDITION),std)
22
PBK_PKG_REPO = pg_probackup-forks
3-
PBK_EDITION_FULL =Standart
3+
PBK_EDITION_FULL =Standard
44
PKG_NAME_SUFFIX = std-
55
else ifeq ($(PBK_EDITION),ent)
66
PBK_PKG_REPO = pg_probackup-forks
@@ -42,12 +42,9 @@ build/all: build/debian build/ubuntu build/centos build/oraclelinux build/alt bu
4242
@echo Packaging is done
4343

4444
### DEBIAN
45-
build/debian: build/debian_8 build/debian_9 build/debian_10 build/debian_11
45+
build/debian: build/debian_9 build/debian_10 build/debian_11
4646
@echo Debian: done
4747

48-
build/debian_8: build/debian_8_9.6 build/debian_8_10 build/debian_8_11 build/debian_8_12 build/debian_8_13 build/debian_8_14
49-
@echo Debian 8: done
50-
5148
build/debian_9: build/debian_9_9.6 build/debian_9_10 build/debian_9_11 build/debian_9_12 build/debian_9_13 build/debian_9_14
5249
@echo Debian 9: done
5350

@@ -58,15 +55,9 @@ build/debian_11: build/debian_11_9.6 build/debian_11_10 build/debian_11_11 build
5855
@echo Debian 11: done
5956

6057
### UBUNTU
61-
build/ubuntu: build/ubuntu_14.04 build/ubuntu_16.04 build/ubuntu_18.04 build/ubuntu_20.04
58+
build/ubuntu: build/ubuntu_18.04 build/ubuntu_20.04
6259
@echo Ubuntu: done
6360

64-
build/ubuntu_14.04: build/ubuntu_14.04_9.6 build/ubuntu_14.04_10 build/ubuntu_14.04_11 build/ubuntu_14.04_12 build/ubuntu_14.04_13 build/ubuntu_14.04_14
65-
@echo Ubuntu 14.04: done
66-
67-
build/ubuntu_16.04: build/ubuntu_16.04_9.6 build/ubuntu_16.04_10 build/ubuntu_16.04_11 build/ubuntu_16.04_12 build/ubuntu_16.04_13 build/ubuntu_16.04_14
68-
@echo Ubuntu 16.04: done
69-
7061
build/ubuntu_18.04: build/ubuntu_18.04_9.6 build/ubuntu_18.04_10 build/ubuntu_18.04_11 build/ubuntu_18.04_12 build/ubuntu_18.04_13 build/ubuntu_18.04_14
7162
@echo Ubuntu 18.04: done
7263

@@ -95,7 +86,8 @@ build/centos: build/centos_7 build/centos_8 #build/rpm_repo_package_centos
9586
build/centos_7: build/centos_7_9.6 build/centos_7_10 build/centos_7_11 build/centos_7_12 build/centos_7_13 build/centos_7_14
9687
@echo Centos 7: done
9788

98-
build/centos_8: build/centos_8_9.6 build/centos_8_10 build/centos_8_11 build/centos_8_12 build/centos_8_13 build/centos_8_14
89+
# pgpro-9.6@centos-8 doesn't exist
90+
build/centos_8: build/centos_8_10 build/centos_8_11 build/centos_8_12 build/centos_8_13 build/centos_8_14 #build/centos_8_9.6
9991
@echo Centos 8: done
10092

10193
# Oracle Linux
@@ -108,7 +100,8 @@ build/oraclelinux_6: build/oraclelinux_6_9.6 build/oraclelinux_6_10 build/oracle
108100
build/oraclelinux_7: build/oraclelinux_7_9.6 build/oraclelinux_7_10 build/oraclelinux_7_11 build/oraclelinux_7_12 build/oraclelinux_7_13 build/oraclelinux_7_14
109101
@echo Oraclelinux 7: done
110102

111-
build/oraclelinux_8: build/oraclelinux_8_9.6 build/oraclelinux_8_10 build/oraclelinux_8_11 build/oraclelinux_8_12 build/oraclelinux_8_13 build/oraclelinux_8_14
103+
# pgpro-9.6@oraclelinux-8 doesn't exist
104+
build/oraclelinux_8: build/oraclelinux_8_10 build/oraclelinux_8_11 build/oraclelinux_8_12 build/oraclelinux_8_13 build/oraclelinux_8_14 #build/oraclelinux_8_9.6
112105
@echo Oraclelinux 8: done
113106

114107
# RHEL
@@ -170,7 +163,8 @@ include packaging/pkg/Makefile.alt
170163
build/suse: build/suse_15.1 build/suse_15.2
171164
@echo Suse: done
172165

173-
build/suse_15.1: build/suse_15.1_9.6 build/suse_15.1_10 build/suse_15.1_11 build/suse_15.1_12 build/suse_15.1_13 build/suse_15.1_14
166+
# there is no PG-14 in suse-15.1 repositories (test fails)
167+
build/suse_15.1: build/suse_15.1_9.6 build/suse_15.1_10 build/suse_15.1_11 build/suse_15.1_12 build/suse_15.1_13
174168
@echo Rhel 15.1: done
175169

176170
build/suse_15.2: build/suse_15.2_9.6 build/suse_15.2_10 build/suse_15.2_11 build/suse_15.2_12 build/suse_15.2_13 build/suse_15.2_14

‎packaging/Makefile.repo

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
#### REPO BUILD ####
2-
repo: check_env repo/debian repo/ubuntu repo/centos repo/oraclelinux repo/alt repo/suse repo_finish #repo/rhel
2+
repo: check_env repo/debian repo/ubuntu repo/centos repo/oraclelinux repo/rhel repo/alt repo/suse repo_finish
33
@echo Build repo for all platform: done
44

55
# Debian
6-
repo/debian: build/repo_debian_8 build/repo_debian_9 build/repo_debian_10 build/repo_debian_11
6+
repo/debian: build/repo_debian_9 build/repo_debian_10 build/repo_debian_11
77
@echo Build repo for debian platforms: done
88

9-
build/repo_debian_8:
10-
$(call build_repo_deb,debian,8,jessie)
11-
touch build/repo_debian_8
12-
139
build/repo_debian_9:
1410
$(call build_repo_deb,debian,9,stretch)
1511
touch build/repo_debian_9
@@ -23,17 +19,9 @@ build/repo_debian_11:
2319
touch build/repo_debian_11
2420

2521
# Ubuntu
26-
repo/ubuntu: build/repo_ubuntu_14.04 build/repo_ubuntu_16.04 build/repo_ubuntu_18.04 build/repo_ubuntu_20.04
22+
repo/ubuntu: build/repo_ubuntu_18.04 build/repo_ubuntu_20.04
2723
@echo Build repo for ubuntu platforms: done
2824

29-
build/repo_ubuntu_14.04:
30-
$(call build_repo_deb,ubuntu,14.04,trusty)
31-
touch build/repo_ubuntu_14.04
32-
33-
build/repo_ubuntu_16.04:
34-
$(call build_repo_deb,ubuntu,16.04,xenial)
35-
touch build/repo_ubuntu_16.04
36-
3725
build/repo_ubuntu_18.04:
3826
$(call build_repo_deb,ubuntu,18.04,bionic)
3927
touch build/repo_ubuntu_18.04

‎packaging/Makefile.test

Lines changed: 26 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -9,33 +9,30 @@ endif
99
test: build/test_all
1010
@echo Test for all platform: done
1111

12-
build/test_all: build/test_debian build/test_ubuntu build/test_centos build/test_oraclelinux build/test_alt build/test_suse #build/test_rhel
12+
build/test_all: build/test_debian build/test_ubuntu build/test_centos build/test_oraclelinux build/test_alt build/test_suse #build/test_rhel
1313
@echo Package testing is done
1414

1515
### DEBIAN
16-
build/test_debian: build/test_debian_9 build/test_debian_10#build/test_debian_11
16+
build/test_debian: build/test_debian_9 build/test_debian_10 build/test_debian_11
1717
@echo Debian: done
1818

19-
build/test_debian_9: build/test_debian_9_9.6 build/test_debian_9_10 build/test_debian_9_11 build/test_debian_9_12 build/test_debian_9_13
19+
build/test_debian_9: build/test_debian_9_9.6 build/test_debian_9_10 build/test_debian_9_11 build/test_debian_9_12 build/test_debian_9_13 build/test_debian_9_14
2020
@echo Debian 9: done
2121

22-
build/test_debian_10: build/test_debian_10_9.6 build/test_debian_10_10 build/test_debian_10_11 build/test_debian_10_12 build/test_debian_10_13
22+
build/test_debian_10: build/test_debian_10_9.6 build/test_debian_10_10 build/test_debian_10_11 build/test_debian_10_12 build/test_debian_10_13 build/test_debian_10_14
2323
@echo Debian 10: done
2424

25-
build/test_debian_11: build/test_debian_11_9.6 build/test_debian_11_10 build/test_debian_11_11 build/test_debian_11_12 build/test_debian_11_13
25+
build/test_debian_11: build/test_debian_11_9.6 build/test_debian_11_10 build/test_debian_11_11 build/test_debian_11_12 build/test_debian_11_13 build/test_debian_11_14
2626
@echo Debian 11: done
2727

2828
### UBUNTU
29-
build/test_ubuntu: build/test_ubuntu_16.04 build/test_ubuntu_18.04 build/test_ubuntu_20.04
29+
build/test_ubuntu: build/test_ubuntu_18.04 build/test_ubuntu_20.04
3030
@echo Ubuntu: done
3131

32-
build/test_ubuntu_16.04: build/test_ubuntu_16.04_9.6 build/test_ubuntu_16.04_10 build/test_ubuntu_16.04_11 build/test_ubuntu_16.04_12 build/test_ubuntu_16.04_13
33-
@echo Ubuntu 16.04: done
34-
35-
build/test_ubuntu_18.04: build/test_ubuntu_18.04_9.6 build/test_ubuntu_18.04_10 build/test_ubuntu_18.04_11 build/test_ubuntu_18.04_12 build/test_ubuntu_18.04_13
32+
build/test_ubuntu_18.04: build/test_ubuntu_18.04_9.6 build/test_ubuntu_18.04_10 build/test_ubuntu_18.04_11 build/test_ubuntu_18.04_12 build/test_ubuntu_18.04_13 build/test_ubuntu_18.04_14
3633
@echo Ubuntu 18.04: done
3734

38-
build/test_ubuntu_20.04: build/test_ubuntu_20.04_9.6 build/test_ubuntu_20.04_10 build/test_ubuntu_20.04_11 build/test_ubuntu_20.04_12 build/test_ubuntu_20.04_13
35+
build/test_ubuntu_20.04: build/test_ubuntu_20.04_9.6 build/test_ubuntu_20.04_10 build/test_ubuntu_20.04_11 build/test_ubuntu_20.04_12 build/test_ubuntu_20.04_13 build/test_ubuntu_20.04_14
3936
@echo Ubuntu 20.04: done
4037

4138
define test_deb
@@ -57,42 +54,32 @@ include packaging/test/Makefile.ubuntu
5754
build/test_centos: build/test_centos_7 build/test_centos_8
5855
@echo Centos: done
5956

60-
build/test_centos_7: build/test_centos_7_9.6 build/test_centos_7_10 build/test_centos_7_11 build/test_centos_7_12 build/test_centos_7_13
61-
# pgpro
62-
#build/test_centos_7: build/test_centos_7_9.6 build/test_centos_7_10 build/test_centos_7_11 build/test_centos_7_12
57+
build/test_centos_7: build/test_centos_7_9.6 build/test_centos_7_10 build/test_centos_7_11 build/test_centos_7_12 build/test_centos_7_13 #build/test_centos_7_14
6358
@echo Centos 7: done
6459

65-
build/test_centos_8: build/test_centos_8_9.6 build/test_centos_8_10 build/test_centos_8_11 build/test_centos_8_12 build/test_centos_8_13
66-
# pgpro
67-
#build/test_centos_8: build/test_centos_8_10 build/test_centos_8_11 build/test_centos_8_12
60+
# pgpro-9.6@centos-8 doesn't exist
61+
build/test_centos_8: build/test_centos_8_10 build/test_centos_8_11 build/test_centos_8_12 build/test_centos_8_13 #build/test_centos_8_14 build/test_centos_8_9.6
6862
@echo Centos 8: done
6963

7064
# Oracle Linux
7165
build/test_oraclelinux: build/test_oraclelinux_7 build/test_oraclelinux_8
7266
@echo Oraclelinux: done
7367

74-
build/test_oraclelinux_7: build/test_oraclelinux_7_9.6 build/test_oraclelinux_7_10 build/test_oraclelinux_7_11 build/test_oraclelinux_7_12 build/test_oraclelinux_7_13
75-
# pgpro
76-
#build/test_oraclelinux_7: build/test_oraclelinux_7_9.6 build/test_oraclelinux_7_10 build/test_oraclelinux_7_11 build/test_oraclelinux_7_12
68+
build/test_oraclelinux_7: build/test_oraclelinux_7_9.6 build/test_oraclelinux_7_10 build/test_oraclelinux_7_11 build/test_oraclelinux_7_12 build/test_oraclelinux_7_13 #build/test_oraclelinux_7_14
7769
@echo Oraclelinux 7: done
7870

79-
build/test_oraclelinux_8: build/test_oraclelinux_8_9.6 build/test_oraclelinux_8_10 build/test_oraclelinux_8_11 build/test_oraclelinux_8_12 build/test_oraclelinux_8_13
80-
# pgpro
81-
#build/test_oraclelinux_8: build/test_oraclelinux_8_10 build/test_oraclelinux_8_11 build/test_oraclelinux_8_12
71+
# pgpro-9.6@oraclelinux-8 doesn't exist
72+
build/test_oraclelinux_8: build/test_oraclelinux_8_10 build/test_oraclelinux_8_11 build/test_oraclelinux_8_12 build/test_oraclelinux_8_13 #build/test_oraclelinux_8_14 build/test_oraclelinux_8_9.6
8273
@echo Oraclelinux 8: done
8374

8475
# RHEL
85-
build/test_rhel: build/test_rhel_7 build/test_rhel_8
76+
build/test_rhel: build/test_rhel_7#build/test_rhel_8
8677
@echo Rhel: done
8778

88-
build/test_rhel_7: build/test_rhel_7_9.5 build/test_rhel_7_9.6 build/test_rhel_7_10 build/test_rhel_7_11 build/test_rhel_7_12 build/test_rhel_7_13
89-
# pgpro
90-
#build/test_rhel_7: build/test_rhel_7_9.5 build/test_rhel_7_9.6 build/test_rhel_7_10 build/test_rhel_7_11 build/test_rhel_7_12
79+
build/test_rhel_7: build/test_rhel_7_9.6 build/test_rhel_7_10 build/test_rhel_7_11 build/test_rhel_7_12 build/test_rhel_7_13 #build/test_rhel_7_14
9180
@echo Rhel 7: done
9281

93-
build/test_rhel_8: build/test_rhel_8_9.5 build/test_rhel_8_9.6 build/test_rhel_8_10 build/test_rhel_8_11 build/test_rhel_8_12 build/test_rhel_8_13
94-
# pgpro
95-
#build/test_rhel_8: build/test_rhel_8_9.5 build/test_rhel_8_9.6 build/test_rhel_8_10 build/test_rhel_8_11 build/test_rhel_8_12
82+
build/test_rhel_8: build/test_rhel_8_9.6 build/test_rhel_8_10 build/test_rhel_8_11 build/test_rhel_8_12 build/test_rhel_8_13 build/test_rhel_8_14
9683
@echo Rhel 8: done
9784

9885
define test_rpm
@@ -112,10 +99,16 @@ include packaging/test/Makefile.rhel
11299
include packaging/test/Makefile.oraclelinux
113100

114101
# Alt Linux
115-
build/test_alt: build/test_alt_9
102+
build/test_alt: build/test_alt_8 build/test_alt_9
116103
@echo Alt Linux: done
117104

118-
build/test_alt_9: build/test_alt_9_9.6 build/test_alt_9_10 build/test_alt_9_11 build/test_alt_9_12 build/test_alt_9_13
105+
# nginx@alt7 fall with 'nginx: [alert] sysctl(KERN_RTSIGMAX) failed (1: Operation not permitted)'
106+
# within docker on modern host linux kernels (this nginx build require Linux between 2.2.19 and 2.6.17)
107+
108+
build/test_alt_8: build/test_alt_8_9.6 build/test_alt_8_10 build/test_alt_8_11 build/test_alt_8_12 build/test_alt_8_13 build/test_alt_8_14
109+
@echo Alt Linux 8: done
110+
111+
build/test_alt_9: build/test_alt_9_9.6 build/test_alt_9_10 build/test_alt_9_11 build/test_alt_9_12 build/test_alt_9_13 build/test_alt_9_14
119112
@echo Alt Linux 9: done
120113

121114
define test_alt
@@ -139,7 +132,7 @@ build/test_suse: build/test_suse_15.1 build/test_suse_15.2
139132
build/test_suse_15.1: build/test_suse_15.1_9.6 build/test_suse_15.1_10 build/test_suse_15.1_11 build/test_suse_15.1_12 build/test_suse_15.1_13
140133
@echo Rhel 15.1: done
141134

142-
build/test_suse_15.2: build/test_suse_15.2_9.6 build/test_suse_15.2_10 build/test_suse_15.2_11 build/test_suse_15.2_12 build/test_suse_15.2_13
135+
build/test_suse_15.2: build/test_suse_15.2_9.6 build/test_suse_15.2_10 build/test_suse_15.2_11 build/test_suse_15.2_12 build/test_suse_15.2_13 build/test_suse_15.2_14
143136
@echo Rhel 15.1: done
144137

145138
define test_suse

‎packaging/Readme.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ export PBK_VERSION=2.4.17
44
export PBK_HASH=57f871accce2604
55
export PBK_RELEASE=1
66
export PBK_EDITION=std|ent
7-
make pkg
7+
make--keep-goingpkg
88
```
99

10-
To build binaries for PostgresProStandart or Enterprise, a pgpro.tar.bz2 with latest git tree must be preset in`packaging/pkg/tarballs` directory:
10+
To build binaries for PostgresProStandard or Enterprise, a pgpro.tar.bz2 with latest git tree must be preset in`packaging/pkg/tarballs` directory:
1111
```
1212
cd packaging/pkg/tarballs
1313
git clone pgpro_repo pgpro
@@ -19,3 +19,5 @@ Repo must be build using 1 thread (due to debian bullshit):
1919
```
2020
make repo -j1
2121
```
22+
23+

‎packaging/pkg/Makefile.alt

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,27 @@ build/alt_7_9.5:
44
touch build/alt_7_9.5
55

66
build/alt_7_9.6:
7-
$(call build_alt,alt,7,,9.6,9.6.23)
7+
$(call build_alt,alt,7,,9.6,9.6.24)
88
touch build/alt_7_9.6
99

1010
build/alt_7_10:
11-
$(call build_alt,alt,7,,10,10.18)
11+
$(call build_alt,alt,7,,10,10.19)
1212
touch build/alt_7_10
1313

1414
build/alt_7_11:
15-
$(call build_alt,alt,7,,11,11.13)
15+
$(call build_alt,alt,7,,11,11.14)
1616
touch build/alt_7_11
1717

1818
build/alt_7_12:
19-
$(call build_alt,alt,7,,12,12.8)
19+
$(call build_alt,alt,7,,12,12.9)
2020
touch build/alt_7_12
2121

2222
build/alt_7_13:
23-
$(call build_alt,alt,7,,13,13.4)
23+
$(call build_alt,alt,7,,13,13.5)
2424
touch build/alt_7_13
2525

2626
build/alt_7_14:
27-
$(call build_alt,alt,7,,14,14.0)
27+
$(call build_alt,alt,7,,14,14.1)
2828
touch build/alt_7_14
2929

3030
# ALT 8
@@ -33,27 +33,27 @@ build/alt_8_9.5:
3333
touch build/alt_8_9.5
3434

3535
build/alt_8_9.6:
36-
$(call build_alt,alt,8,,9.6,9.6.23)
36+
$(call build_alt,alt,8,,9.6,9.6.24)
3737
touch build/alt_8_9.6
3838

3939
build/alt_8_10:
40-
$(call build_alt,alt,8,,10,10.18)
40+
$(call build_alt,alt,8,,10,10.19)
4141
touch build/alt_8_10
4242

4343
build/alt_8_11:
44-
$(call build_alt,alt,8,,11,11.13)
44+
$(call build_alt,alt,8,,11,11.14)
4545
touch build/alt_8_11
4646

4747
build/alt_8_12:
48-
$(call build_alt,alt,8,,12,12.8)
48+
$(call build_alt,alt,8,,12,12.9)
4949
touch build/alt_8_12
5050

5151
build/alt_8_13:
52-
$(call build_alt,alt,8,,13,13.4)
52+
$(call build_alt,alt,8,,13,13.5)
5353
touch build/alt_8_13
5454

5555
build/alt_8_14:
56-
$(call build_alt,alt,8,,14,14.0)
56+
$(call build_alt,alt,8,,14,14.1)
5757
touch build/alt_8_14
5858

5959
# ALT 9
@@ -62,26 +62,26 @@ build/alt_9_9.5:
6262
touch build/alt_9_9.5
6363

6464
build/alt_9_9.6:
65-
$(call build_alt,alt,9,,9.6,9.6.23)
65+
$(call build_alt,alt,9,,9.6,9.6.24)
6666
touch build/alt_9_9.6
6767

6868
build/alt_9_10:
69-
$(call build_alt,alt,9,,10,10.18)
69+
$(call build_alt,alt,9,,10,10.19)
7070
touch build/alt_9_10
7171

7272
build/alt_9_11:
73-
$(call build_alt,alt,9,,11,11.13)
73+
$(call build_alt,alt,9,,11,11.14)
7474
touch build/alt_9_11
7575

7676
build/alt_9_12:
77-
$(call build_alt,alt,9,,12,12.8)
77+
$(call build_alt,alt,9,,12,12.9)
7878
touch build/alt_9_12
7979

8080
build/alt_9_13:
81-
$(call build_alt,alt,9,,13,13.4)
81+
$(call build_alt,alt,9,,13,13.5)
8282
touch build/alt_9_13
8383

8484
build/alt_9_14:
85-
$(call build_alt,alt,9,,14,14.0)
85+
$(call build_alt,alt,9,,14,14.1)
8686
touch build/alt_9_14
8787

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp