Skip to content

Commit 5361c5f

Browse files
authored
Merge pull request #567 from ANXS/566-remove-postgresql-11-testing
566 remove postgresql 11 testing
2 parents 787693b + 6852bcd commit 5361c5f

File tree

4 files changed

+16
-26
lines changed

4 files changed

+16
-26
lines changed

README.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -54,19 +54,19 @@ An example how to include this role as a task:
5454

5555
#### Compatibility matrix
5656

57-
| Distribution / PostgreSQL | 10 | 11 | 12 | 13 | 14 | 15 |
58-
| ------------------------- |:--:|:--:|:--:|:--:|:--:|:--:|
59-
| CentOS 7.x | :interrobang: | :white_check_mark: | :white_check_mark: | :white_check_mark: |:grey_question: | :grey_question: |
60-
| CentOS 8.x | :interrobang: | :white_check_mark: | :white_check_mark: | :white_check_mark: |:grey_question: | :grey_question: |
61-
| Debian 9.x | :interrobang: | :white_check_mark: | :white_check_mark: | :white_check_mark: |:grey_question: | :grey_question: |
62-
| Debian 10.x | :grey_question: | :grey_question: | :grey_question: | :grey_question: |:grey_question: | :grey_question: |
63-
| Debian 11.x | :interrobang: | :grey_question: | :grey_question: | :grey_question: |:grey_question: | :white_check_mark: |
64-
| Ubuntu 16.04.x | :interrobang: | :white_check_mark: | :white_check_mark: | :white_check_mark: |:grey_question: | :grey_question: |
65-
| Ubuntu 18.04.x | :interrobang: | :white_check_mark: | :white_check_mark: | :white_check_mark: |:grey_question: | :grey_question: |
66-
| Ubuntu 20.04.x | :interrobang: | :white_check_mark: | :white_check_mark: | :white_check_mark: |:grey_question: | :grey_question: |
67-
| Ubuntu 22.04.x | :interrobang: | :white_check_mark: | :white_check_mark: | :white_check_mark: |:grey_question: | :white_check_mark: |
68-
| Rockylinux 9.x | :interrobang: | :grey_question: | :grey_question: | :grey_question: |:white_check_mark: | :white_check_mark: |
69-
| Fedora 37 | :grey_question: | :grey_question: | :grey_question: | :grey_question: |:grey_question: | :grey_question: |
57+
| Distribution / PostgreSQL | 10 | 11 | 12 | 13 | 14 | 15 | 16 |
58+
| ------------------------- |:--:|:--:|:--:|:--:|:--:|:--:|:--:|
59+
| CentOS 7.x | :interrobang: | :interrobang: | :white_check_mark: | :white_check_mark: |:grey_question: | :grey_question: | :grey_question: |
60+
| CentOS 8.x | :interrobang: | :interrobang: | :white_check_mark: | :white_check_mark: |:grey_question: | :grey_question: | :grey_question: |
61+
| Debian 9.x | :interrobang: | :interrobang: | :white_check_mark: | :white_check_mark: |:grey_question: | :grey_question: | :grey_question: |
62+
| Debian 10.x | :interrobang: | :interrobang: | :grey_question: | :grey_question: |:grey_question: | :grey_question: | :grey_question: |
63+
| Debian 11.x | :interrobang: | :interrobang: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :grey_question: |
64+
| Ubuntu 16.04.x | :interrobang: | :interrobang: | :white_check_mark: | :white_check_mark: |:grey_question: | :grey_question: | :grey_question: |
65+
| Ubuntu 18.04.x | :interrobang: | :interrobang: | :white_check_mark: | :white_check_mark: |:grey_question: | :grey_question: | :grey_question: |
66+
| Ubuntu 20.04.x | :interrobang: | :interrobang: | :white_check_mark: | :white_check_mark: |:grey_question: | :grey_question: | :grey_question: |
67+
| Ubuntu 22.04.x | :interrobang: | :interrobang: | :white_check_mark: | :white_check_mark: |:white_check_mark: | :white_check_mark: | :grey_question: |
68+
| Rockylinux 9.x | :interrobang: | :interrobang: | :white_check_mark: | :white_check_mark: |:white_check_mark: | :white_check_mark: | :grey_question: |
69+
| Fedora 37 | :interrobang: | :interrobang: | :grey_question: | :grey_question: |:grey_question: | :grey_question: | :grey_question: |
7070

7171
- :white_check_mark: - tested, works fine
7272
- :warning: - Not for production use

defaults/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -802,11 +802,11 @@ postgresql_apt_pin_priority: 500
802802

803803
# YUM repository locations
804804
postgresql_yum_repository_url: "http://yum.postgresql.org"
805-
postgresql_pgdg_repository_url: "https://download.postgresql.org/pub/repos/yum/"
805+
postgresql_pgdg_repository_url: "https://download.postgresql.org/pub/repos/yum"
806806

807807
# YUM (RedHat, CentOS, etc.) baseurl/gpgkey
808808
postgresql_yum_repository_baseurl: "{{ postgresql_yum_repository_url }}/{{ postgresql_version }}/{{ ansible_os_family | lower }}/rhel-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}"
809-
postgresql_yum_repository_gpgkey: "{{ postgresql_pgdg_repository_url }}/RPM-GPG-KEY-PGDG-{{ postgresql_version_terse }}"
809+
postgresql_yum_repository_gpgkey: "{{ postgresql_pgdg_repository_url }}/keys/PGDG-RPM-GPG-KEY-RHEL"
810810

811811
# DNF (Fedora) baseurl/gpgkey
812812
postgresql_dnf_repository_baseurl: "{{ postgresql_yum_repository_url }}/{{ postgresql_version }}/fedora/fedora-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}"

molecule/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ This directory is the home of the test playbooks:
77

88
## Molecule
99

10-
The default tested version is postgresql 10, 11, 12, and 13 on Ubuntu 20.04. Linting is disabled for the tests.
10+
The default tested version is postgresql 12, 13, 14, 15 and 16 on Debian 11. Linting is disabled for the tests.
1111

1212
The default distribution is ubuntu2204. You can override th with setting the environment variable MOLECULE_DISTRO to one of:
1313

molecule/default/molecule.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,6 @@ lint: |
88
# yamllint .
99
# ansible-lint
1010
platforms:
11-
- name: postgresql-11
12-
image: "geerlingguy/docker-${MOLECULE_DISTRO:-debian11}-ansible:latest"
13-
volumes:
14-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
15-
privileged: true
16-
pre_build_image: true
17-
cgroupns_mode: host
18-
command: ${MOLECULE_DOCKER_COMMAND:-""}
1911
- name: postgresql-12
2012
image: "geerlingguy/docker-${MOLECULE_DISTRO:-debian11}-ansible:latest"
2113
volumes:
@@ -58,8 +50,6 @@ provisioner:
5850
converge: ${MOLECULE_PLAYBOOK:-../../tests/playbook.yml}
5951
inventory:
6052
host_vars:
61-
postgresql-11:
62-
postgresql_version: 11
6353
postgresql-12:
6454
postgresql_version: 12
6555
postgresql-13:

0 commit comments

Comments
 (0)