From 2b9817d3ba9bf24a1633108ec6fc5658094187f4 Mon Sep 17 00:00:00 2001 From: Muhammad Aqeel Date: Wed, 24 Apr 2024 18:18:07 +0000 Subject: [PATCH 1/2] [PKG-33]: Fixes PPG repo name issue from Jenkins. (#460) --- percona-packaging/scripts/pg_stat_monitor_builder.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) mode change 100644 => 100755 percona-packaging/scripts/pg_stat_monitor_builder.sh diff --git a/percona-packaging/scripts/pg_stat_monitor_builder.sh b/percona-packaging/scripts/pg_stat_monitor_builder.sh old mode 100644 new mode 100755 index 3bb36eb..1bc38b7 --- a/percona-packaging/scripts/pg_stat_monitor_builder.sh +++ b/percona-packaging/scripts/pg_stat_monitor_builder.sh @@ -21,6 +21,7 @@ Usage: $0 [OPTIONS] --rpm_release RPM version( default = 1) --deb_release DEB version( default = 1) --pg_release PPG version build on( default = 11) + --ppg_repo_name PPG repo name (default ppg-11.18) --version product version --help) usage ;; Example $0 --builddir=/tmp/test --get_sources=1 --build_src_rpm=1 --build_rpm=1 @@ -57,6 +58,7 @@ append_arg_to_args () { --rpm_release=*) RPM_RELEASE="$val" ;; --deb_release=*) DEB_RELEASE="$val" ;; --pg_release=*) PG_RELEASE="$val" ;; + --ppg_repo_name=*) PPG_REPO_NAME="$val";; --version=*) VERSION="$val" ;; --help) usage ;; *) @@ -201,7 +203,7 @@ install_deps() { if [ "$OS" == "rpm" ] then yum install -y https://repo.percona.com/yum/percona-release-latest.noarch.rpm - percona-release enable ppg-${PG_RELEASE} testing + percona-release enable ${PPG_REPO_NAME} testing yum -y install git wget PKGLIST="percona-postgresql${PG_RELEASE}-devel" @@ -235,7 +237,7 @@ install_deps() { wget https://repo.percona.com/apt/percona-release_latest.generic_all.deb dpkg -i percona-release_latest.generic_all.deb rm -f percona-release_latest.generic_all.deb - percona-release enable ppg-${PG_RELEASE} testing + percona-release enable ${PPG_REPO_NAME} testing PKGLIST="percona-postgresql-${PG_RELEASE} percona-postgresql-common percona-postgresql-server-dev-all" @@ -512,6 +514,7 @@ DEB_RELEASE=1 REPO="https://github.com/Percona/pg_stat_monitor.git" VERSION="1.0.0" PG_RELEASE=11 +PPG_REPO_NAME=ppg-11.18 parse_arguments PICK-ARGS-FROM-ARGV "$@" check_workdir From 61256faf8347d8421fd8a67ea291913b9ee570fa Mon Sep 17 00:00:00 2001 From: Muhammad Aqeel Date: Thu, 25 Apr 2024 07:23:12 +0000 Subject: [PATCH 2/2] [PKG-33]: Fixes PPG repo name issue for EL9. (#461) --- percona-packaging/scripts/pg_stat_monitor_builder.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/percona-packaging/scripts/pg_stat_monitor_builder.sh b/percona-packaging/scripts/pg_stat_monitor_builder.sh index 1bc38b7..8ff9b1c 100755 --- a/percona-packaging/scripts/pg_stat_monitor_builder.sh +++ b/percona-packaging/scripts/pg_stat_monitor_builder.sh @@ -514,7 +514,7 @@ DEB_RELEASE=1 REPO="https://github.com/Percona/pg_stat_monitor.git" VERSION="1.0.0" PG_RELEASE=11 -PPG_REPO_NAME=ppg-11.18 +PPG_REPO_NAME=ppg-11 parse_arguments PICK-ARGS-FROM-ARGV "$@" check_workdir