[ci skip] packaging "tuning"

Author: kulaginm

packaging/Makefile.repo

@@ -113,6 +113,7 @@ build/repo_suse_15.2:
 repo_finish:
 #	cd build/data/www/$(PBK_PKG_REPO)/
 	cd $(BUILDDIR)/data/www/$(PBK_PKG_REPO)/rpm && sudo ln -nsf $(PBK_VERSION) latest
+	# following line only for vanilla
 	cd $(BUILDDIR)/data/www/$(PBK_PKG_REPO)/srpm && sudo ln -nsf $(PBK_VERSION) latest
 
 #	sudo ln -rfs build/data/www/$(PBK_PKG_REPO)/rpm/${PBK_VERSION} build/data/www/$(PBK_PKG_REPO)/rpm/latest

packaging/Makefile.test

@@ -13,7 +13,7 @@ build/test_all: build/test_debian build/test_ubuntu build/test_centos build/test
 	@echo Package testing is done
 
 ### DEBIAN
-build/test_debian: build/test_debian_9 build/test_debian_10 build/test_debian_11
+build/test_debian: build/test_debian_9 build/test_debian_10 #build/test_debian_11
 	@echo Debian: done
 
 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
@@ -58,29 +58,41 @@ build/test_centos: build/test_centos_7 build/test_centos_8
 	@echo Centos: done
 
 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
+# pgpro
+#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
 	@echo Centos 7: done
 
 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
+# pgpro
+#build/test_centos_8: build/test_centos_8_10 build/test_centos_8_11 build/test_centos_8_12
 	@echo Centos 8: done
 
 # Oracle Linux
 build/test_oraclelinux: build/test_oraclelinux_7 build/test_oraclelinux_8
 	@echo Oraclelinux: done
 
 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
+# pgpro
+#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
 	@echo Oraclelinux 7: done
 
 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
+# pgpro
+#build/test_oraclelinux_8: build/test_oraclelinux_8_10 build/test_oraclelinux_8_11 build/test_oraclelinux_8_12
 	@echo Oraclelinux 8: done
 
 # RHEL
 build/test_rhel: build/test_rhel_7 build/test_rhel_8
 	@echo Rhel: done
 
 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
+# pgpro
+#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
 	@echo Rhel 7: done
 
 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
+# pgpro
+#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
 	@echo Rhel 8: done
 
 define test_rpm

packaging/pkg/specs/rpm/rpmbuild/SPECS/pg_probackup-pgpro.spec

@@ -42,7 +42,7 @@ mkdir %{_topdir}/SOURCES/pg_probackup-%{version}
 cd %{_topdir}/BUILD/postgrespro-%{edition}-%{pgsql_full}
 
 %if "%{pgsql_major}" == "9.6"
-./configure --enable-debug
+./configure --enable-debug --without-readline
 %else
 ./configure --enable-debug --without-readline --prefix=%{prefix}
 %endif

packaging/pkg/specs/rpm/rpmbuild/SPECS/pg_probackup.alt.forks.spec

@@ -43,7 +43,7 @@ cd %{_topdir}/BUILD/postgrespro-%{edition}-%{pgsql_full}
 %if "%{pgsql_major}" == "9.6"
 ./configure --enable-debug
 %else
-./configure --enable-debug --prefix=%{prefix}
+./configure --enable-debug --disable-online-upgrade --prefix=%{prefix}
 %endif
 make -C 'src/common'
 make -C 'src/port'

packaging/test/Makefile.debian

@@ -39,3 +39,24 @@ build/test_debian_10_12:
 build/test_debian_10_13:
 	$(call test_deb,debian,10,buster,13,13.2)
 	touch build/test_debian_10_13
+
+# DEBIAN 11
+build/test_debian_11_9.6:
+	$(call test_deb,debian,11,bullseye,9.6,9.6.21)
+	touch build/test_debian_11_9.6
+
+build/test_debian_11_10:
+	$(call test_deb,debian,11,bullseye,10,10.16)
+	touch build/test_debian_11_10
+
+build/test_debian_11_11:
+	$(call test_deb,debian,11,bullseye,11,11.11)
+	touch build/test_debian_11_11
+
+build/test_debian_11_12:
+	$(call test_deb,debian,11,bullseye,12,12.6)
+	touch build/test_debian_11_12
+
+build/test_debian_11_13:
+	$(call test_deb,debian,11,bullseye,13,13.2)
+	touch build/test_debian_11_13

packaging/test/scripts/deb.sh

@@ -17,6 +17,7 @@ PG_TOG=$(echo $PG_VERSION | sed 's|\.||g')
 export DEBIAN_FRONTEND=noninteractive
 echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
 
+#apt-get -qq --allow-releaseinfo-change update
 apt-get -qq update
 apt-get -qq install -y wget nginx gnupg lsb-release
 #apt-get -qq install -y libterm-readline-gnu-perl dialog gnupg procps
@@ -45,7 +46,7 @@ nginx -s reload || (pkill -9 nginx || nginx -c /etc/nginx/nginx.conf &)
 # install POSTGRESQL
 #if [ ${CODENAME} == 'precise' ] && [ ${PG_VERSION} != '10' ] && [ ${PG_VERSION} != '11' ]; then
   sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
-  wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
+  wget --no-check-certificate -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
   apt-get update -y
   apt-get install -y postgresql-${PG_VERSION}
 #fi

packaging/test/scripts/rpm.sh

@@ -13,6 +13,7 @@ ulimit -n 1024
 
 PG_TOG=$(echo $PG_VERSION | sed 's|\.||g')
 
+yum update -y
 # yum upgrade -y || echo 'some packages in docker failed to upgrade'
 # yum install -y sudo
 if [ ${DISTRIB} == 'rhel' ] && [ ${PG_TOG} == '13' ]; then # no packages for PG13 on PGDG