From f249fc651ff7889b1d92160568e8afc18ed7c346 Mon Sep 17 00:00:00 2001 From: MrMegaNova Date: Fri, 28 Jul 2023 15:26:09 +0200 Subject: [PATCH] update README.md with newer versions & fix molecule tests --- README.md | 27 ++++++------ molecule/README.md | 6 ++- molecule/default/molecule.yml | 18 ++++++-- molecule/default/molecule.yml.orig | 64 ---------------------------- molecule/default/molecule.yml.pg14 | 28 ------------ molecule/default/molecule.yml.pg1415 | 37 ---------------- tests/docker/group_vars/all.yml | 2 + version | 2 +- 8 files changed, 36 insertions(+), 148 deletions(-) delete mode 100644 molecule/default/molecule.yml.orig delete mode 100644 molecule/default/molecule.yml.pg14 delete mode 100644 molecule/default/molecule.yml.pg1415 diff --git a/README.md b/README.md index 2ac2ba04..22abfe83 100644 --- a/README.md +++ b/README.md @@ -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 @@ -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" @@ -177,6 +178,7 @@ 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) @@ -184,6 +186,7 @@ Top Contributors: - [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) diff --git a/molecule/README.md b/molecule/README.md index 44dfc936..b8882d19 100644 --- a/molecule/README.md +++ b/molecule/README.md @@ -16,6 +16,7 @@ The default distribution is ubuntu2204. You can override th with setting the env * fedora37 * debian9 * debian10 +* debian11 * ubuntu1604 * ubuntu1804 * ubuntu2004 @@ -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 ``` @@ -47,10 +48,10 @@ 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 @@ -58,6 +59,7 @@ 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. diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 9bd3fa63..4a2c03cb 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -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: "" diff --git a/molecule/default/molecule.yml.orig b/molecule/default/molecule.yml.orig deleted file mode 100644 index 6d53ec0c..00000000 --- a/molecule/default/molecule.yml.orig +++ /dev/null @@ -1,64 +0,0 @@ ---- -dependency: - name: galaxy -driver: - name: docker -lint: | - set -e -# yamllint . -# ansible-lint -platforms: - - name: postgresql-9_6 - image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2004}-ansible:latest" - command: "" - volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:ro - privileged: true - pre_build_image: true - - name: postgresql-10 - image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2004}-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" - 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" - 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" - command: "" - volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:ro - privileged: true - pre_build_image: true -provisioner: - name: ansible - playbooks: - prepare: ${MOLECULE_PLAYBOOK:-../../tests/prepare.yml} - converge: ${MOLECULE_PLAYBOOK:-../../tests/playbook.yml} - inventory: - host_vars: - postgresql-9_6: - postgresql_version: 9.6 - postgresql-10: - postgresql_version: 10 - postgresql-11: - postgresql_version: 11 - postgresql-12: - postgresql_version: 12 - postgresql-13: - postgresql_version: 13 -verifier: - name: ansible diff --git a/molecule/default/molecule.yml.pg14 b/molecule/default/molecule.yml.pg14 deleted file mode 100644 index 2da81bd4..00000000 --- a/molecule/default/molecule.yml.pg14 +++ /dev/null @@ -1,28 +0,0 @@ ---- -dependency: - name: galaxy -driver: - name: docker -lint: | - set -e -# yamllint . -# ansible-lint -platforms: - - 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 -provisioner: - name: ansible - playbooks: - prepare: ${MOLECULE_PLAYBOOK:-../../tests/prepare.yml} - converge: ${MOLECULE_PLAYBOOK:-../../tests/playbook.yml} - inventory: - host_vars: - postgresql-14: - postgresql_version: 14 -verifier: - name: ansible diff --git a/molecule/default/molecule.yml.pg1415 b/molecule/default/molecule.yml.pg1415 deleted file mode 100644 index 9d893ef9..00000000 --- a/molecule/default/molecule.yml.pg1415 +++ /dev/null @@ -1,37 +0,0 @@ ---- -dependency: - name: galaxy -driver: - name: docker -lint: | - set -e -# yamllint . -# ansible-lint -platforms: - - 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: "" - volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:ro - privileged: true - pre_build_image: true -provisioner: - name: ansible - playbooks: - prepare: ${MOLECULE_PLAYBOOK:-../../tests/prepare.yml} - converge: ${MOLECULE_PLAYBOOK:-../../tests/playbook.yml} - inventory: - host_vars: - postgresql-14: - postgresql_version: 14 - postgresql-15: - postgresql_version: 15 -verifier: - name: ansible diff --git a/tests/docker/group_vars/all.yml b/tests/docker/group_vars/all.yml index 329aa794..30d7e0a4 100644 --- a/tests/docker/group_vars/all.yml +++ b/tests/docker/group_vars/all.yml @@ -5,3 +5,5 @@ postgresql_versions: - 11 - 12 - 13 + - 14 + - 15 diff --git a/version b/version index b2812046..79f9beba 100644 --- a/version +++ b/version @@ -1 +1 @@ -v1.13.0 +v1.14.0