Skip to content

Commit

Permalink
update README.md with newer versions & fix molecule tests
Browse files Browse the repository at this point in the history
  • Loading branch information
MrMegaNova committed Jul 28, 2023
1 parent b265a5f commit f249fc6
Show file tree
Hide file tree
Showing 8 changed files with 36 additions and 148 deletions.
27 changes: 15 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,18 @@ An example how to include this role as a task:

#### Compatibility matrix

| Distribution / PostgreSQL | 10 | 11 | 12 | 13 |
| ------------------------- |:--:|:--:|:--:|:--:|
| CentOS 7.x | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
| CentOS 8.x | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
| Debian 9.x | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
| Debian 10.x | :grey_question: | :grey_question: | :grey_question: | :grey_question: |
| Ubuntu 16.04.x | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
| Ubuntu 18.04.x | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
| Ubuntu 20.04.x | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
| Ubuntu 22.04.x | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
| Fedora 37 | :grey_question: | :grey_question: | :grey_question: | :grey_question: |
| Distribution / PostgreSQL | 10 | 11 | 12 | 13 | 14 | 15 |
| ------------------------- |:--:|:--:|:--:|:--:|:--:|:--:|
| CentOS 7.x | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |:grey_question: | :grey_question: |
| CentOS 8.x | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |:grey_question: | :grey_question: |
| Debian 9.x | :white_check_mark: | :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 | :grey_question: | :grey_question: | :grey_question: | :grey_question: |:grey_question: | :white_check_mark: |
| Ubuntu 16.04.x | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |:grey_question: | :grey_question: |
| Ubuntu 18.04.x | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |:grey_question: | :grey_question: |
| Ubuntu 20.04.x | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |:grey_question: | :grey_question: |
| Ubuntu 22.04.x | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |:grey_question: | :white_check_mark: |
| Fedora 37 | :grey_question: | :grey_question: | :grey_question: | :grey_question: |:grey_question: | :grey_question: |

- :white_check_mark: - tested, works fine
- :warning: - Not for production use
Expand All @@ -78,7 +79,7 @@ An example how to include this role as a task:

```yaml
# Basic settings
postgresql_version: 13
postgresql_version: 15
postgresql_encoding: "UTF-8"
postgresql_locale: "en_US.UTF-8"
postgresql_ctype: "en_US.UTF-8"
Expand Down Expand Up @@ -177,13 +178,15 @@ Maintainers:
- [Sergei Antipov](https://github.com/UnderGreen)
- [Greg Clough](https://github.com/gclough)
- [Magnus Lübeck](https://github.com/maglub)
- [Leo C.](https://github.com/MrMegaNova)

Top Contributors:
- [David Farrington](https://github.com/farridav)
- [Jesse Lang](https://github.com/jesselang)
- [Michael Conrad](https://github.com/MichaelConrad)
- [Sébastien Alix](https://github.com/sebalix)
- [Copperfield](https://github.com/Copperfield)
- [T. Soulabail](https://github.com/tsoulabail)

- [Ralph von der Heyden](https://github.com/ralph)

Expand Down
6 changes: 4 additions & 2 deletions molecule/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ The default distribution is ubuntu2204. You can override th with setting the env
* fedora37
* debian9
* debian10
* debian11
* ubuntu1604
* ubuntu1804
* ubuntu2004
Expand All @@ -25,7 +26,7 @@ Manual execution of the molecule tests with the distro of your liking. Examples:

```
MOLECULE_DISTRO=centos8 molecule converge
MOLECULE_DISTRO=debian10 molecule converge
MOLECULE_DISTRO=debian11 molecule converge
MOLECULE_DISTRO=ubuntu2204 molecule converge
```

Expand All @@ -47,17 +48,18 @@ The playbooks read variables from two files. One common vars file, and one with

```
$ ls -1 tests/ | grep vars
vars.yml
vars.CentOS.7.yml
vars.CentOS.8.yml
vars.Debian.10.yml
vars.Debian.11.yml
vars.Debian.9.yml
vars.Debian.yml
vars.Fedora.37.yml
vars.Ubuntu.16.yml
vars.Ubuntu.18.yml
vars.Ubuntu.20.yml
vars.Ubuntu.22.yml
vars.yml
```

The main difference, currently, is which python version to use.
Expand Down
18 changes: 14 additions & 4 deletions molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,30 +9,40 @@ lint: |
# ansible-lint
platforms:
- name: postgresql-10
image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2004}-ansible:latest"
image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2204}-ansible:latest"
command: ""
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
privileged: true
pre_build_image: true
- name: postgresql-11
image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2004}-ansible:latest"
image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2204}-ansible:latest"
command: ""
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
privileged: true
pre_build_image: true
- name: postgresql-12
image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2004}-ansible:latest"
image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2204}-ansible:latest"
command: ""
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
privileged: true
pre_build_image: true
- name: postgresql-13
image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2004}-ansible:latest"
image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2204}-ansible:latest"
command: ""
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
privileged: true
pre_build_image: true
- name: postgresql-14
image: "geerlingguy/docker-${MOLECULE_DISTRO:-debian11}-ansible:latest"
command: ""
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
privileged: true
pre_build_image: true
- name: postgresql-15
image: "geerlingguy/docker-${MOLECULE_DISTRO:-debian11}-ansible:latest"
command: ""
Expand Down
64 changes: 0 additions & 64 deletions molecule/default/molecule.yml.orig

This file was deleted.

28 changes: 0 additions & 28 deletions molecule/default/molecule.yml.pg14

This file was deleted.

37 changes: 0 additions & 37 deletions molecule/default/molecule.yml.pg1415

This file was deleted.

2 changes: 2 additions & 0 deletions tests/docker/group_vars/all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ postgresql_versions:
- 11
- 12
- 13
- 14
- 15
2 changes: 1 addition & 1 deletion version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.13.0
v1.14.0

0 comments on commit f249fc6

Please sign in to comment.