[v2.0] Update PostgreSQL RPM GPG key url (#3425)

hitachienergy · Jan 9, 2024 · addf9d1 · addf9d1
1 parent 2e535d0
commit addf9d1
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/ansible/playbooks/roles/postgresql/molecule/_shared/scripts/add-repos-redhat.sh b/ansible/playbooks/roles/postgresql/molecule/_shared/scripts/add-repos-redhat.sh
@@ -133,7 +133,7 @@ name=PostgreSQL 13 for RHEL/CentOS $releasever - $basearch
 baseurl=https://download.postgresql.org/pub/repos/yum/13/redhat/rhel-$releasever-$basearch
 enabled=1
 gpgcheck=1
-gpgkey=https://download.postgresql.org/pub/repos/yum/RPM-GPG-KEY-PGDG
+gpgkey=https://download.postgresql.org/pub/repos/yum/keys/PGDG-RPM-GPG-KEY-RHEL
 EOF
 )
 
@@ -143,7 +143,7 @@ name=PostgreSQL common for RHEL/CentOS $releasever - $basearch
 baseurl=https://download.postgresql.org/pub/repos/yum/common/redhat/rhel-$releasever-$basearch
 enabled=1
 gpgcheck=1
-gpgkey=https://download.postgresql.org/pub/repos/yum/RPM-GPG-KEY-PGDG
+gpgkey=https://download.postgresql.org/pub/repos/yum/keys/PGDG-RPM-GPG-KEY-RHEL
 EOF
 )
 

diff --git a/...books/roles/repository/files/download-requirements/repositories/aarch64/redhat/redhat.yml b/...books/roles/repository/files/download-requirements/repositories/aarch64/redhat/redhat.yml
@@ -55,7 +55,7 @@ repositories:
       gpgcheck=1
       module_hotfixes=true
     gpg_keys:
-      - https://download.postgresql.org/pub/repos/yum/RPM-GPG-KEY-PGDG
+      - https://download.postgresql.org/pub/repos/yum/keys/PGDG-RPM-GPG-KEY-AARCH64-RHEL
 
   rabbitmq:
     id: rabbitmq-server

diff --git a/...ybooks/roles/repository/files/download-requirements/repositories/x86_64/redhat/redhat.yml b/...ybooks/roles/repository/files/download-requirements/repositories/x86_64/redhat/redhat.yml
@@ -55,7 +55,7 @@ repositories:
       gpgcheck=1
       module_hotfixes=true
     gpg_keys:
-      - https://download.postgresql.org/pub/repos/yum/RPM-GPG-KEY-PGDG
+      - https://download.postgresql.org/pub/repos/yum/keys/PGDG-RPM-GPG-KEY-RHEL
 
   rabbitmq:
     id: rabbitmq-server

diff --git a/ci/ansible/playbooks/os/rhel/upgrade-release.yml b/ci/ansible/playbooks/os/rhel/upgrade-release.yml
@@ -467,7 +467,7 @@
         file: pgdg{{ postgresql_version }}-rhel-{{ versions.target.full }}
         description: PostgreSQL {{ postgresql_version }} for RHEL/CentOS {{ versions.target.full }} - $basearch
         baseurl: https://download.postgresql.org/pub/repos/yum/{{ postgresql_version }}/redhat/rhel-{{ versions.target.full }}-$basearch
-        gpgkey: https://download.postgresql.org/pub/repos/yum/RPM-GPG-KEY-PGDG
+        gpgkey: https://download.postgresql.org/pub/repos/yum/keys/PGDG-RPM-GPG-KEY-RHEL
         enabled: false
         gpgcheck: true
         module_hotfixes: true

diff --git a/docs/changelogs/CHANGELOG-2.0.md b/docs/changelogs/CHANGELOG-2.0.md
@@ -1,6 +1,12 @@
 <!-- markdownlint-disable-file no-duplicate-header -->
 # Changelog 2.0
 
+## [2.0.11] 2024-01-DD
+
+### Fixed
+
+- [#3424](https://github.com/hitachienergy/epiphany/issues/3424) - PostgreSQL yum repo GPG key not available
+
 ## [2.0.10] 2023-11-17
 
 ### Fixed