Use an alternate repository for PostgreSQL 10 RHEL packages (#3390)

hitachienergy · Sep 6, 2023 · b924dfe · b924dfe
1 parent 6ebcd1f
commit b924dfe
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 26 deletions.
diff --git a/CHANGELOG-1.0.md b/CHANGELOG-1.0.md
@@ -3,6 +3,12 @@
 ### NOTE: ⚠️[**Ubuntu 18.04 LTS EOL**](https://ubuntu.com/blog/18-04-end-of-standard-support)⚠️
 Ubuntu 18.04 LTS reached the end of the standard support on 31 May 2023.
 
+## [1.0.13] YYYY-MM-DD
+
+### Fixed
+
+- [#3389](https://github.com/hitachienergy/epiphany/issues/3389) - PostgreSQL 10 yum repository not available
+
 ## [1.0.12] 2023-06-05
 
 ### Updated

diff --git a/.../playbooks/roles/repository/files/download-requirements/centos-7/download-requirements.sh b/.../playbooks/roles/repository/files/download-requirements/centos-7/download-requirements.sh
@@ -682,16 +682,6 @@ gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cl
 EOF
 )
 
-POSTGRESQL_REPO_CONF=$(cat <<'EOF'
-[pgdg10]
-name=PostgreSQL 10 for RHEL/CentOS $releasever - $basearch
-baseurl=https://download.postgresql.org/pub/repos/yum/10/redhat/rhel-$releasever-$basearch
-enabled=1
-gpgcheck=1
-gpgkey=https://download.postgresql.org/pub/repos/yum/RPM-GPG-KEY-PGDG
-EOF
-)
-
 RABBITMQ_SERVER_REPO_CONF=$(cat <<'EOF'
 [rabbitmq-server]
 name=rabbitmq-rpm
@@ -717,7 +707,6 @@ add_repo_as_file 'elasticsearch-7' "$ELASTICSEARCH_7_REPO_CONF"
 add_repo_as_file 'elasticsearch-curator-5' "$ELASTICSEARCH_CURATOR_REPO_CONF"
 add_repo_as_file 'grafana' "$GRAFANA_REPO_CONF"
 add_repo_as_file 'kubernetes' "$KUBERNETES_REPO_CONF"
-add_repo_as_file 'postgresql-10' "$POSTGRESQL_REPO_CONF"
 add_repo_as_file 'bintray-rabbitmq-rpm' "$RABBITMQ_SERVER_REPO_CONF"
 add_repo_from_script 'https://dl.2ndquadrant.com/default/release/get/10/rpm'
 disable_repo '2ndquadrant-dl-default-release-pg10-debug'

diff --git a/.../ansible/playbooks/roles/repository/files/download-requirements/centos-7/requirements.txt b/.../ansible/playbooks/roles/repository/files/download-requirements/centos-7/requirements.txt
@@ -70,7 +70,6 @@ perl-libs # for vim
 perl-Pod-Perldoc # for vim
 perl-Pod-Simple # for vim
 perl-Pod-Usage # for vim
-pgaudit12_10
 pgbouncer-1.10.*
 policycoreutils-python # for container-selinux
 pyldb # for cifs-utils
@@ -90,7 +89,6 @@ quota # for nfs-utils
 rabbitmq-server-3.8.9
 rh-haproxy18
 rh-haproxy18-haproxy-syspaths
-postgresql10-server
 repmgr10-4.0.6
 samba-client
 samba-client-libs # for samba-client
@@ -151,6 +149,10 @@ https://github.com/hitachienergy/alternative-repo/raw/main/1.0.x/redhat/packages
 https://github.com/hitachienergy/alternative-repo/raw/main/1.0.x/redhat/packages/opendistro-security-1.13.1.0.rpm
 https://github.com/hitachienergy/alternative-repo/raw/main/1.0.x/redhat/packages/opendistro-sql-1.13.0.0.rpm
 https://github.com/hitachienergy/alternative-repo/raw/main/1.0.x/redhat/packages/opendistroforelasticsearch-kibana-1.13.1-linux-x64.rpm
+https://github.com/hitachienergy/alternative-repo/raw/main/1.0.x/redhat/packages/pgaudit12_10-1.2.4-1.rhel7.x86_64.rpm
+https://github.com/hitachienergy/alternative-repo/raw/main/1.0.x/redhat/packages/postgresql10-10.23-1PGDG.rhel7.x86_64.rpm
+https://github.com/hitachienergy/alternative-repo/raw/main/1.0.x/redhat/packages/postgresql10-libs-10.23-1PGDG.rhel7.x86_64.rpm
+https://github.com/hitachienergy/alternative-repo/raw/main/1.0.x/redhat/packages/postgresql10-server-10.23-1PGDG.rhel7.x86_64.rpm
 
 [files]
 # Github repository for erlang rpm is used since packagecloud repository is limited to a certain number of versions and erlang package from erlang-solutions repository is much more complex and bigger

diff --git a/.../playbooks/roles/repository/files/download-requirements/redhat-7/download-requirements.sh b/.../playbooks/roles/repository/files/download-requirements/redhat-7/download-requirements.sh
@@ -717,16 +717,6 @@ gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cl
 EOF
 )
 
-POSTGRESQL_REPO_CONF=$(cat <<'EOF'
-[pgdg10]
-name=PostgreSQL 10 for RHEL/CentOS $releasever - $basearch
-baseurl=https://download.postgresql.org/pub/repos/yum/10/redhat/rhel-$releasever-$basearch
-enabled=1
-gpgcheck=1
-gpgkey=https://download.postgresql.org/pub/repos/yum/RPM-GPG-KEY-PGDG
-EOF
-)
-
 RABBITMQ_SERVER_REPO_CONF=$(cat <<'EOF'
 [rabbitmq-server]
 name=rabbitmq-rpm
@@ -752,7 +742,6 @@ add_repo_as_file 'elasticsearch-7' "$ELASTICSEARCH_7_REPO_CONF"
 add_repo_as_file 'elasticsearch-curator-5' "$ELASTICSEARCH_CURATOR_REPO_CONF"
 add_repo_as_file 'grafana' "$GRAFANA_REPO_CONF"
 add_repo_as_file 'kubernetes' "$KUBERNETES_REPO_CONF"
-add_repo_as_file 'postgresql-10' "$POSTGRESQL_REPO_CONF"
 add_repo_as_file 'bintray-rabbitmq-rpm' "$RABBITMQ_SERVER_REPO_CONF"
 add_repo_from_script 'https://dl.2ndquadrant.com/default/release/get/10/rpm'
 disable_repo '2ndquadrant-dl-default-release-pg10-debug'

diff --git a/.../ansible/playbooks/roles/repository/files/download-requirements/redhat-7/requirements.txt b/.../ansible/playbooks/roles/repository/files/download-requirements/redhat-7/requirements.txt
@@ -68,7 +68,6 @@ perl-libs # for vim
 perl-Pod-Perldoc # for vim
 perl-Pod-Simple # for vim
 perl-Pod-Usage # for vim
-pgaudit12_10
 pgbouncer-1.10.*
 policycoreutils-python # for container-selinux
 pyldb # for cifs-utils
@@ -86,7 +85,6 @@ quota # for nfs-utils
 rabbitmq-server-3.8.9
 rh-haproxy18
 rh-haproxy18-haproxy-syspaths
-postgresql10-server
 repmgr10-4.0.6
 samba-client
 samba-client-libs # for samba-client
@@ -147,6 +145,10 @@ https://github.com/hitachienergy/alternative-repo/raw/main/1.0.x/redhat/packages
 https://github.com/hitachienergy/alternative-repo/raw/main/1.0.x/redhat/packages/opendistro-security-1.13.1.0.rpm
 https://github.com/hitachienergy/alternative-repo/raw/main/1.0.x/redhat/packages/opendistro-sql-1.13.0.0.rpm
 https://github.com/hitachienergy/alternative-repo/raw/main/1.0.x/redhat/packages/opendistroforelasticsearch-kibana-1.13.1-linux-x64.rpm
+https://github.com/hitachienergy/alternative-repo/raw/main/1.0.x/redhat/packages/pgaudit12_10-1.2.4-1.rhel7.x86_64.rpm
+https://github.com/hitachienergy/alternative-repo/raw/main/1.0.x/redhat/packages/postgresql10-10.23-1PGDG.rhel7.x86_64.rpm
+https://github.com/hitachienergy/alternative-repo/raw/main/1.0.x/redhat/packages/postgresql10-libs-10.23-1PGDG.rhel7.x86_64.rpm
+https://github.com/hitachienergy/alternative-repo/raw/main/1.0.x/redhat/packages/postgresql10-server-10.23-1PGDG.rhel7.x86_64.rpm
 
 [files]
 # Github repository for erlang rpm is used since packagecloud repository is limited to a certain number of versions and erlang package from erlang-solutions repository is much more complex and bigger