From a3e087dc6aac75a232e2df2c1aa66e5c3ff3833c Mon Sep 17 00:00:00 2001 From: Leochocolat Date: Mon, 15 Jan 2024 14:45:23 +0100 Subject: [PATCH 1/3] Drop pg11 testing on molecule & update Readme --- README.md | 26 +++++++++++++------------- molecule/README.md | 2 +- molecule/default/molecule.yml | 10 ---------- 3 files changed, 14 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 32557464..b46ffb57 100644 --- a/README.md +++ b/README.md @@ -54,19 +54,19 @@ An example how to include this role as a task: #### Compatibility matrix -| Distribution / PostgreSQL | 10 | 11 | 12 | 13 | 14 | 15 | -| ------------------------- |:--:|:--:|:--:|:--:|:--:|:--:| -| CentOS 7.x | :interrobang: | :white_check_mark: | :white_check_mark: | :white_check_mark: |:grey_question: | :grey_question: | -| CentOS 8.x | :interrobang: | :white_check_mark: | :white_check_mark: | :white_check_mark: |:grey_question: | :grey_question: | -| Debian 9.x | :interrobang: | :white_check_mark: | :white_check_mark: | :white_check_mark: |:grey_question: | :grey_question: | -| Debian 10.x | :grey_question: | :grey_question: | :grey_question: | :grey_question: |:grey_question: | :grey_question: | -| Debian 11.x | :interrobang: | :grey_question: | :grey_question: | :grey_question: |:grey_question: | :white_check_mark: | -| Ubuntu 16.04.x | :interrobang: | :white_check_mark: | :white_check_mark: | :white_check_mark: |:grey_question: | :grey_question: | -| Ubuntu 18.04.x | :interrobang: | :white_check_mark: | :white_check_mark: | :white_check_mark: |:grey_question: | :grey_question: | -| Ubuntu 20.04.x | :interrobang: | :white_check_mark: | :white_check_mark: | :white_check_mark: |:grey_question: | :grey_question: | -| Ubuntu 22.04.x | :interrobang: | :white_check_mark: | :white_check_mark: | :white_check_mark: |:grey_question: | :white_check_mark: | -| Rockylinux 9.x | :interrobang: | :grey_question: | :grey_question: | :grey_question: |:white_check_mark: | :white_check_mark: | -| Fedora 37 | :grey_question: | :grey_question: | :grey_question: | :grey_question: |:grey_question: | :grey_question: | +| Distribution / PostgreSQL | 10 | 11 | 12 | 13 | 14 | 15 | 16 | +| ------------------------- |:--:|:--:|:--:|:--:|:--:|:--:|:--:| +| CentOS 7.x | :interrobang: | :interrobang: | :white_check_mark: | :white_check_mark: |:grey_question: | :grey_question: | :grey_question: | +| CentOS 8.x | :interrobang: | :interrobang: | :white_check_mark: | :white_check_mark: |:grey_question: | :grey_question: | :grey_question: | +| Debian 9.x | :interrobang: | :interrobang: | :white_check_mark: | :white_check_mark: |:grey_question: | :grey_question: | :grey_question: | +| Debian 10.x | :interrobang: | :interrobang: | :grey_question: | :grey_question: |:grey_question: | :grey_question: | :grey_question: | +| Debian 11.x | :interrobang: | :interrobang: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :grey_question: | +| Ubuntu 16.04.x | :interrobang: | :interrobang: | :white_check_mark: | :white_check_mark: |:grey_question: | :grey_question: | :grey_question: | +| Ubuntu 18.04.x | :interrobang: | :interrobang: | :white_check_mark: | :white_check_mark: |:grey_question: | :grey_question: | :grey_question: | +| Ubuntu 20.04.x | :interrobang: | :interrobang: | :white_check_mark: | :white_check_mark: |:grey_question: | :grey_question: | :grey_question: | +| Ubuntu 22.04.x | :interrobang: | :interrobang: | :white_check_mark: | :white_check_mark: |:white_check_mark: | :white_check_mark: | :grey_question: | +| Rockylinux 9.x | :interrobang: | :interrobang: | :white_check_mark: | :grey_question: |:white_check_mark: | :white_check_mark: | :grey_question: | +| Fedora 37 | :interrobang: | :interrobang: | :grey_question: | :grey_question: |:grey_question: | :grey_question: | :grey_question: | - :white_check_mark: - tested, works fine - :warning: - Not for production use diff --git a/molecule/README.md b/molecule/README.md index 0a70fdd2..60bea289 100644 --- a/molecule/README.md +++ b/molecule/README.md @@ -7,7 +7,7 @@ This directory is the home of the test playbooks: ## Molecule -The default tested version is postgresql 10, 11, 12, and 13 on Ubuntu 20.04. Linting is disabled for the tests. +The default tested version is postgresql 12, 13, 14, 15 and 16 on Debian 11. Linting is disabled for the tests. The default distribution is ubuntu2204. You can override th with setting the environment variable MOLECULE_DISTRO to one of: diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 5e3e9325..bc0cfb3f 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -8,14 +8,6 @@ lint: | # yamllint . # ansible-lint platforms: - - name: postgresql-11 - image: "geerlingguy/docker-${MOLECULE_DISTRO:-debian11}-ansible:latest" - volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:rw - privileged: true - pre_build_image: true - cgroupns_mode: host - command: ${MOLECULE_DOCKER_COMMAND:-""} - name: postgresql-12 image: "geerlingguy/docker-${MOLECULE_DISTRO:-debian11}-ansible:latest" volumes: @@ -58,8 +50,6 @@ provisioner: converge: ${MOLECULE_PLAYBOOK:-../../tests/playbook.yml} inventory: host_vars: - postgresql-11: - postgresql_version: 11 postgresql-12: postgresql_version: 12 postgresql-13: From 8ec3675c679450cd420bfef49e010612c87c1ebd Mon Sep 17 00:00:00 2001 From: Leochocolat Date: Mon, 15 Jan 2024 14:46:34 +0100 Subject: [PATCH 2/3] fix readme compatibility matrix --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b46ffb57..73548921 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ An example how to include this role as a task: | Ubuntu 18.04.x | :interrobang: | :interrobang: | :white_check_mark: | :white_check_mark: |:grey_question: | :grey_question: | :grey_question: | | Ubuntu 20.04.x | :interrobang: | :interrobang: | :white_check_mark: | :white_check_mark: |:grey_question: | :grey_question: | :grey_question: | | Ubuntu 22.04.x | :interrobang: | :interrobang: | :white_check_mark: | :white_check_mark: |:white_check_mark: | :white_check_mark: | :grey_question: | -| Rockylinux 9.x | :interrobang: | :interrobang: | :white_check_mark: | :grey_question: |:white_check_mark: | :white_check_mark: | :grey_question: | +| Rockylinux 9.x | :interrobang: | :interrobang: | :white_check_mark: | :white_check_mark: |:white_check_mark: | :white_check_mark: | :grey_question: | | Fedora 37 | :interrobang: | :interrobang: | :grey_question: | :grey_question: |:grey_question: | :grey_question: | :grey_question: | - :white_check_mark: - tested, works fine From 6852bcd03948248eb72060abe87dd99f2b71d848 Mon Sep 17 00:00:00 2001 From: conscribtor Date: Tue, 16 Jan 2024 18:00:35 +0000 Subject: [PATCH 3/3] update pgdg repository and gpg key url On the 3 January 2024, PostgreSQL has updated their RPM GPG keys: https://yum.postgresql.org/news/pgdg-rpm-repo-gpg-key-update/ --- defaults/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 7d362cb7..8ce26f9f 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -802,11 +802,11 @@ postgresql_apt_pin_priority: 500 # YUM repository locations postgresql_yum_repository_url: "http://yum.postgresql.org" -postgresql_pgdg_repository_url: "https://download.postgresql.org/pub/repos/yum/" +postgresql_pgdg_repository_url: "https://download.postgresql.org/pub/repos/yum" # YUM (RedHat, CentOS, etc.) baseurl/gpgkey postgresql_yum_repository_baseurl: "{{ postgresql_yum_repository_url }}/{{ postgresql_version }}/{{ ansible_os_family | lower }}/rhel-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}" -postgresql_yum_repository_gpgkey: "{{ postgresql_pgdg_repository_url }}/RPM-GPG-KEY-PGDG-{{ postgresql_version_terse }}" +postgresql_yum_repository_gpgkey: "{{ postgresql_pgdg_repository_url }}/keys/PGDG-RPM-GPG-KEY-RHEL" # DNF (Fedora) baseurl/gpgkey postgresql_dnf_repository_baseurl: "{{ postgresql_yum_repository_url }}/{{ postgresql_version }}/fedora/fedora-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}"