Merge branch 'development' into pg16

ANXS · Jan 17, 2024 · b45df59 · b45df59
2 parents bf99ff3 + 5361c5f
commit b45df59
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 27 deletions.
diff --git a/README.md b/README.md
@@ -54,25 +54,21 @@ An example how to include this role as a task:
 
 #### Compatibility matrix
 
-| Distribution / PostgreSQL |     10     |       11        |         12         |         13         |         14         |         15         |       16        |
-| ------------------------- | :--------: | :-------------: | :----------------: | :----------------: | :----------------: | :----------------: | :-------------: |
-| CentOS 7.x                | :no_entry: |   :no_entry:    | :white_check_mark: | :white_check_mark: |  :grey_question:   |  :grey_question:   | :grey_question: |
-| CentOS 8.x                | :no_entry: |   :no_entry:    | :white_check_mark: | :white_check_mark: |  :grey_question:   |  :grey_question:   | :grey_question: |
-| Debian 9.x                | :no_entry: |   :no_entry:    | :white_check_mark: | :white_check_mark: |  :grey_question:   |  :grey_question:   | :grey_question: |
-| Debian 10.x               | :no_entry: |   :no_entry:    |  :grey_question:   |  :grey_question:   |  :grey_question:   |  :grey_question:   | :grey_question: |
-| Debian 11.x               | :no_entry: |   :no_entry:    |  :grey_question:   |  :grey_question:   |  :grey_question:   | :white_check_mark: | :grey_question: |
-| Ubuntu 16.04.x            | :no_entry: |   :no_entry:    | :white_check_mark: | :white_check_mark: |  :grey_question:   |  :grey_question:   | :grey_question: |
-| Ubuntu 18.04.x            | :no_entry: |   :no_entry:    | :white_check_mark: | :white_check_mark: |  :grey_question:   |  :grey_question:   | :grey_question: |
-| Ubuntu 20.04.x            | :no_entry: |   :no_entry:    | :white_check_mark: | :white_check_mark: |  :grey_question:   |  :grey_question:   | :grey_question: |
-| Ubuntu 22.04.x            | :no_entry: |   :no_entry:    | :white_check_mark: | :white_check_mark: |  :grey_question:   | :white_check_mark: | :grey_question: |
-| Rockylinux 9.x            | :no_entry: | :grey_question: |  :grey_question:   |  :grey_question:   | :white_check_mark: | :white_check_mark: | :grey_question: |
-| Fedora 37                 | :no_entry: | :grey_question: |  :grey_question:   |  :grey_question:   |  :grey_question:   |  :grey_question:   | :grey_question: |
+| Distribution / PostgreSQL |     11     |         12         |         13         |         14         |         15         |       16        |
+| ------------------------- | :--------: | :----------------: | :----------------: | :----------------: | :----------------: | :-------------: |
+| CentOS 8.x                | :no_entry: | :white_check_mark: | :white_check_mark: |  :grey_question:   |  :grey_question:   | :grey_question: |
+| Debian 11.x               | :no_entry: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :grey_question: |
+| Debian 12.x               | :no_entry: |   :interrobang:    |   :interrobang:    |   :interrobang:    |   :interrobang:    |  :interrobang:  |
+| Ubuntu 20.04.x            | :no_entry: | :white_check_mark: | :white_check_mark: |  :grey_question:   |  :grey_question:   | :grey_question: |
+| Ubuntu 22.04.x            | :no_entry: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :grey_question: |
+| Rockylinux 9.x            | :no_entry: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :grey_question: |
+| Fedora 39                 | :no_entry: |   :interrobang:    |   :interrobang:    |   :interrobang:    |   :interrobang:    |  :interrobang:  |
 
 - :white_check_mark: - tested, works fine
-- :warning: - Not for production use
+- :warning: - not for production use
 - :grey_question: - will work in the future (help out if you can)
 - :interrobang: - maybe works, not tested
-- :no_entry: - Has reached End of Life (EOL)
+- :no_entry: - has reached End of Life (EOL)
 
 
 #### Variables

diff --git 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 versions are 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:
 
@@ -96,4 +96,4 @@ MOLECULE_DISTRO=ubuntu2204 molecule destroy
 
 ## References
 
-* https://github.com/search?q=user%3Ageerlingguy+docker-.*-ansible
+* https://github.com/search?q=user%3Ageerlingguy+docker-.*-ansible
diff --git 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: