Update 1.25.1 supported distributions (#632)

Author: alessfg

.ansible-lint

@@ -2,3 +2,4 @@
 skip_list:
   - name[template]
   - yaml[line-length]
+  - schema[meta]

.github/workflows/molecule.yml

@@ -62,11 +62,11 @@ jobs:
         if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }}
         uses: actions/checkout@v3
 
-      - name: Set up Docker QEMU
-        if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }}
-        uses: docker/setup-qemu-action@v2
-        with:
-          platforms: aarch64,s390x
+      # - name: Set up Docker QEMU
+      #   if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }}
+      #   uses: docker/setup-qemu-action@v2
+      #   with:
+      #     platforms: aarch64,s390x
 
       - name: Set up Python 3
         if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }}
@@ -78,7 +78,7 @@ jobs:
         if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }}
         run: pip3 install -r .github/workflows/requirements/requirements_molecule.txt
 
-      - name: Install Ansible collection dependencies
+      - name: Install Ansible core collection dependencies
         if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }}
         run: ansible-galaxy install -r .github/workflows/requirements/requirements_ansible.yml
 

.github/workflows/requirements/requirements_ansible.yml

@@ -1,10 +1,10 @@
 ---
 collections:
   - name: ansible.posix
-    version: 1.5.2
+    version: 1.5.4
   - name: community.general
     version: 6.4.0
   - name: community.crypto # Only required if you plan to install NGINX Plus
-    version: 2.13.0
+    version: 2.14.1
   - name: community.docker # Only required if you plan to use Molecule
-    version: 3.4.5
+    version: 3.4.7

.github/workflows/requirements/requirements_ansible_lint.txt

@@ -1,2 +1,5 @@
 ansible-core==2.15.0
+jinja2==3.1.2
+ansible-compat==4.1.2
+yamllint==1.32.0
 ansible-lint==6.16.2

.github/workflows/requirements/requirements_molecule.txt

@@ -1,8 +1,6 @@
 ansible-core==2.15.0
 jinja2==3.1.2
-ansible-compat==3.0.2
-ansible-lint==6.16.2
-yamllint==1.32.0
+# ansible-compat==4.1.2
 molecule==5.0.1
 molecule-plugins[docker]==23.4.1
 docker==6.1.3

CHANGELOG.md

@@ -4,21 +4,28 @@
 
 FEATURES:
 
+- Add Alpine Linux 3.18, Debian bookworm, and Ubuntu kinetic/lunar to the list of NGINX OSS tested and supported distributions.
+- Remove Alpine Linux 3.14 from the list of NGINX OSS tested and supported distributions.
 - Remove Alpine Linux 3.13 from the list of NGINX Plus tested and supported distributions.
 
 ENHANCEMENTS:
 
 - Refactor the OSS BSD installation process to consolidate tasks and avoid Ansible Lint warnings.
 - Refactor handlers to avoid Ansible Lint warnings.
 - Enable SELinux configuration tasks on Oracle Linux OS.
-- Bump the Ansible `ansible.posix` collection to `1.5.2`, `community.general` collection to `6.4.0`, `community.crypto` collection to `2.13.0` and `community.docker` collection to `3.4.5`.
-- Oracle Linux 8 requires python library package `python3.11-cryptography` for validating the NGINX Plus repository certificate.
+- Bump the Ansible `ansible.posix` collection to `1.5.4`, `community.general` collection to `6.4.0`, `community.crypto` collection to `2.14.1` and `community.docker` collection to `3.4.7`.
+- Oracle Linux 8 requires the Python `python3.11-cryptography` package for validating the NGINX Plus repository certificate.
+
+BUG FIXES:
+
+- Fix an issue with the platform validation logic whereas distro versions ending in `*.*0` would not be correctly identified.
 
 CI/CD:
 
-- Split Ansible Lint into its own GH actions job since Molecule no longer runs linters natively.
+- Comment out the platform parameter out of Molecule tests. QEMU based tests are failing when trying to test the newest supported distros.
+- Split Ansible Lint into its own GitHub Actions job since Molecule no longer runs linters natively.
 - Replace `molecule[docker]` with `molecule` and `molecule-plugins[docker]`.
-- Explicitly set the `ansible-compat` version.
+- Explicitly set the `ansible-compat` version (commented out for the time being whilst waiting for a new release of Molecule).
 - Add pre-releases to Release Drafter.
 
 ## 0.24.0 (January 29, 2023)
@@ -44,7 +51,8 @@ FEATURES:
 - Validate that various role variables have been set to one of the allowed values.
 - Add support for the newer `ndk` and `set-misc` NGINX Plus dynamic modules and remove old code checks for distributions that are no longer supported.
 - Add AlmaLinux, Oracle Linux and Rocky Linux to the list of NGINX OSS and NGINX Plus tested and supported distributions.
-- Add Alpine Linux 3.17 to the NGINX list of tested and supported platforms (and remove Alpine Linux 3.13 from the list of NGINX OSS supported distributions).
+- Add Alpine Linux 3.17 to the NGINX list of tested and supported platforms.
+- Remove Alpine Linux 3.13 from the list of NGINX OSS supported distributions.
 
 ENHANCEMENTS:
 
@@ -59,14 +67,14 @@ BUG FIXES:
 - Specifying a module version would result in an invalid package name on Alpine Linux.
 - Fix the NGINX installation process when installing NGINX from a distribution's package repository in CentOS/RHEL 7 based distributions.
 - Fix an issue when installing the GeoIP2 module on an UBI 7 container where the the `libmaxminddb` package dependency might not be available via `yum` (if it's not available, `libmaxminddb` is installed from an external source).
-- GitHub actions should now correctly skip \*plus\* scenarios only when the NGINX Plus license secrets are not present.
+- GitHub Actions should now correctly skip \*plus\* scenarios only when the NGINX Plus license secrets are not present.
 - Update the versions of the various packages required to build NGINX from source. The version of `zlib` listed in the role was no longer available.
-- The `ignore-tags` GitHub actions key does not exist. Replace it with the correct key, `tags-ignore`.
+- The `ignore-tags` GitHub Actions key does not exist. Replace it with the correct key, `tags-ignore`.
 - Remove the `arch` option from the Debian family NGINX repository source. In its current form this prevented the role from working any platforms beyond `x86_64`/`amd64` and `aarch64`/`arm64`.
 
 TESTS:
 
-- Update GitHub actions to run on Ubuntu 22.04 (and thus support `cgroups` v2).
+- Update GitHub Actions to run on Ubuntu 22.04 (and thus support `cgroups` v2).
 - Explicitly specify `x86_64`/`amd64` as the platform used in the Amazon Linux 2/CentOS/Oracle Linux/RHEL 7/SLES 15 Molecule Docker images. This will ensure that tests work when run on different host architectures (e.g. newer Macbooks with `aarch64`/`arm64` processors) when running tests in distributions that only support `x86_64`/`amd64` (either due to lack of support for a `cgroups` v2 backport or due to lack of builds for `aarch64`/`arm64`).
 - Explicitly test some distributions using `aarch64` and `s390x` as the Molecule platform. This should ensure the role works as intended across the various architectures that are officially supported.
 - Combine the `module` Molecule scenario with the `default` scenario.
@@ -99,7 +107,7 @@ BUG FIXES:
 
 TESTS:
 
-- Update GitHub actions to only skip \*plus\* scenarios when the NGINX Plus license secrets are not present (it used to only run the NGINX Plus test scenarios during internal PRs).
+- Update GitHub Actions to only skip \*plus\* scenarios when the NGINX Plus license secrets are not present (it used to only run the NGINX Plus test scenarios during internal PRs).
 - Add SLES 15 to all Molecule tests.
 - Create downgrade and upgrade tests for NGINX Plus.
 - Remove Yamllint (Ansible Lint now incorporates Yamllint).
@@ -117,7 +125,7 @@ ENHANCEMENTS:
 - Bump the Ansible `community.general` collection to `4.7.0` and `community.docker` collection to `2.3.0`.
 - Streamline configuring SELinux.
 - Add `TimeoutStartSec` parameter to Systemd template.
-- Update Dependabot to trigger updates at the same time across all NGINX core roles at the same time and to avoid triggering release drafter on GitHub actions dependency updates.
+- Update Dependabot to trigger updates at the same time across all NGINX core roles at the same time and to avoid triggering release drafter on GitHub Actions dependency updates.
 
 BUG FIXES:
 
@@ -175,7 +183,7 @@ BUG FIXES:
 ENHANCEMENTS:
 
 - Change Dependabot frequency from daily to weekly.
-- Minor touch-up of GitHub actions workflows.
+- Minor touch-up of GitHub Actions workflows.
 
 ## 0.21.2 (October 7, 2021)
 
@@ -227,7 +235,7 @@ BREAKING CHANGES:
 ENHANCEMENTS:
 
 - Replace Ansible base with Ansible core. Ansible core will be the "core" Ansible release moving forward from Ansible `2.11`.
-- Update GitHub actions to add a workflow dispatch option.
+- Update GitHub Actions to add a workflow dispatch option.
 - Replace "yes"/"no" boolean values with "true"/"false" to comply with YAML spec `1.2`.
 - Bump the Ansible `community.general` collection to `3.2.0` and `community.docker` collection to `1.7.0`.
 
@@ -258,12 +266,12 @@ FEATURES:
 
 ENHANCEMENTS:
 
-- Only run GitHub actions Galaxy CI/CD workflow when a new release is published.
+- Only run GitHub Actions Galaxy CI/CD workflow when a new release is published.
 - Add Alpine `3.13` to the list of NGINX Plus supported platforms.
-- Specify GitHub actions Ubuntu release.
+- Specify GitHub Actions Ubuntu release.
 - Minor GitHub template tweaks, including the creation of a SECURITY doc.
 - Add Molecule NGINX OSS tests for Alpine 3.13, remove Molecule tests for Debian stretch, and update list of supported platforms.
-- Update Ansible base to `2.10.8`, Ansible Lint to `5.0.7`, Molecule to `3.3.0`, yamllint to `1.26.1` and Docker Python SDK to `5.0.0`.
+- Update Ansible base to `2.10.8`, Ansible Lint to `5.0.7`, Molecule to `3.3.0`, Yamllint to `1.26.1` and Docker Python SDK to `5.0.0`.
 - Consolidate Molecule testing scenarios to address changes introduced in Ansible Lint `5.*`.
 - Override of systemd `Restart` value by using proper `nginx_service_restart` variable.
 
@@ -276,7 +284,7 @@ BUG FIXES:
 
 ENHANCEMENTS:
 
-- The GitHub actions Molecule CI/CD workflow should now correctly avoid running 'plus' related tests on external PRs.
+- The GitHub Actions Molecule CI/CD workflow should now correctly avoid running 'plus' related tests on external PRs.
 - Update Ansible base to `2.10.4`, Ansible to `2.10.5`, Molecule to `3.2.2` and Docker Python SDK to `4.4.1`.
 - Update copyright notice.
 
@@ -288,7 +296,7 @@ BREAKING CHANGES:
 
 ENHANCEMENTS:
 
-The GitHub actions Molecule CI/CD workflow is no longer run on a new release (this is not necessary since it already runs on every push).
+The GitHub Actions Molecule CI/CD workflow is no longer run on a new release (this is not necessary since it already runs on every push).
 
 ## 0.18.2 (December 22, 2020)
 
@@ -297,7 +305,7 @@ ENHANCEMENTS:
 - Update Molecule to `3.2.1` and Docker Python SDK to `4.4.0`.
 - Add Alpine `3.12` to supported platforms for NGINX Plus.
 - Remove Alpine `3.9` and CentOS/RHEL `6` from supported platforms due to EOL.
-- Replace TravisCI with GitHub actions.
+- Replace TravisCI with GitHub Actions.
 
 ## 0.18.1 (November 17, 2020)
 
@@ -335,7 +343,7 @@ ENHANCEMENTS:
 
 - Add survey to README.
 - Improve README structure and use tables where relevant.
-- Update Ansible (now Ansible base) to `2.10.3`, Ansible (now Ansible Community Distribution) to `2.10.3`, Ansible Lint to `4.3.7`, Molecule to `3.1.5`, and yamllint to `1.25.0`.
+- Update Ansible (now Ansible base) to `2.10.3`, Ansible (now Ansible Community Distribution) to `2.10.3`, Ansible Lint to `4.3.7`, Molecule to `3.1.5`, and Yamllint to `1.25.0`.
 - Optimize NGINX Plus install/remove tasks.
 
 BUG FIXES:

README.md

@@ -25,13 +25,13 @@ If you wish to install NGINX Plus using this role, you will need to obtain an NG
     ---
     collections:
       - name: ansible.posix
-        version: 1.5.2
+        version: 1.5.4
       - name: community.general
-        version: 6.6.0
+        version: 6.4.0
       - name: community.crypto # Only required if you plan to install NGINX Plus
-        version: 2.13.0
+        version: 2.14.1
       - name: community.docker # Only required if you plan to use Molecule (see below)
-        version: 3.4.5
+        version: 3.4.7
     ```
 
     **Note:** You can alternatively install the Ansible community distribution (what is known as the "old" Ansible) if you don't want to manage individual collections.
@@ -92,16 +92,17 @@ AlmaLinux:
   - 8
   - 9
 Alpine:
-  - 3.14
   - 3.15
   - 3.16
   - 3.17
+  - 3.18
 Amazon Linux:
   - 2
 CentOS:
   - 7.4+
 Debian:
   - bullseye (11)
+  - bookworm (12)
 Oracle Linux:
   - 7
   - 8
@@ -117,10 +118,10 @@ SUSE/SLES:
   - 12
   - 15
 Ubuntu:
-  - bionic (18.04)
   - focal (20.04)
-  - impish (21.10)
   - jammy (22.04)
+  - kinetic (22.10)
+  - lunar (23.04)
 ```
 
 ### NGINX Plus

meta/main.yml

@@ -15,13 +15,13 @@ galaxy_info:
     - name: Amazon Linux
       versions: ['2', '2023']
     - name: Debian
-      versions: [bullseye]
+      versions: [bullseye, bookworm]
     - name: EL
       versions: ['7', '8', '9']
     - name: FreeBSD
       versions: ['12.1']
     - name: Ubuntu
-      versions: [bionic, focal, impish, jammy]
+      versions: [focal, jammy, kinetic, lunar]
     - name: SLES
       versions: ['12', '15']