Update list of supported platforms for NGINX Plus R25 (#446)

CHANGELOG.md

@@ -8,8 +8,8 @@ Support installing NGINX OSS in Amazon Linux.
 
 ENHANCEMENTS:
 
-* Update the README and Ansible metadata matrix of supported distributions.
+* Update the README and Ansible metadata matrix of supported distributions for NGINX OSS and NGINX Plus.
-* Update the Molecule tests to include the newly supported distributions and remove distributions that are no longer supported.
+* Update the Molecule tests to include the newly supported distributions and remove distributions that are no longer supported for NGINX OSS and NGINX Plus.
 * Bump the Ansible `community.general` collection to `3.7.0`, `ansible.posix` collection to `1.3.0` and `community.docker` collection to `1.9.1`.
 
 ## 0.21.0 (August 11, 2021)

README.md

@@ -85,12 +85,10 @@ Ubuntu:
 
 ```yaml
 Alpine:
-  - 3.10
   - 3.11
   - 3.12
   - 3.13
-Amazon Linux:
+  - 3.14
-  - 2018.03
 Amazon Linux 2:
   - any
 CentOS:
@@ -98,9 +96,10 @@ CentOS:
   - 8
 Debian:
   - buster
+  - bullseye
 FreeBSD:
-  - 11.2+
   - 12.1+
+  - 13
 Oracle Linux:
   - 7.4+
 Red Hat:
@@ -110,10 +109,8 @@ SUSE/SLES:
   - 12
   - 15
 Ubuntu:
-  - xenial
   - bionic
   - focal
-  - groovy
 ```
 
 ### NGINX Amplify Agent

meta/main.yml

@@ -8,15 +8,12 @@ galaxy_info:
 
   license: Apache License, Version 2.0
 
-  min_ansible_version: 2.10
+  min_ansible_version: 2.11
 
   platforms:
     - name: Alpine
       versions:
         - any
-    - name: Amazon
-      versions:
-        - 2018.03
     - name: Amazon Linux 2
       versions:
         - any
@@ -30,12 +27,10 @@ galaxy_info:
         - 8
     - name: FreeBSD
       versions:
-        - 11.4
         - 12.1
         - 13
     - name: Ubuntu
       versions:
-        - xenial
         - bionic
         - focal
         - hirsute

molecule/default/molecule.yml

@@ -34,7 +34,7 @@ platforms:
     volumes:
       - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
     command: "/sbin/init"
-  - name: amazonlinux
+  - name: amazonlinux-2
     image: amazonlinux:2
     dockerfile: ../common/Dockerfile.j2
     privileged: true

molecule/module/molecule.yml

@@ -34,7 +34,7 @@ platforms:
     volumes:
       - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
     command: "/sbin/init"
-  - name: amazonlinux
+  - name: amazonlinux-2
     image: amazonlinux:2
     dockerfile: ../common/Dockerfile.j2
     privileged: true

molecule/plus/molecule.yml

@@ -6,13 +6,6 @@ lint: |
   yamllint .
   ansible-lint --force-color
 platforms:
-  - name: alpine-3.10
-    image: alpine:3.10
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/sbin/init"
   - name: alpine-3.11
     image: alpine:3.11
     dockerfile: ../common/Dockerfile.j2
@@ -34,7 +27,14 @@ platforms:
     volumes:
       - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
     command: "/sbin/init"
-  - name: amazonlinux
+  - name: alpine-3.14
+    image: alpine:3.14
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/sbin/init"
+  - name: amazonlinux-2
     image: amazonlinux:2
     dockerfile: ../common/Dockerfile.j2
     privileged: true
@@ -62,8 +62,8 @@ platforms:
     volumes:
       - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
     command: "/sbin/init"
-  - name: ubuntu-xenial
+  - name: debian-bullseye
-    image: ubuntu:xenial
+    image: debian:bullseye-slim
     dockerfile: ../common/Dockerfile.j2
     privileged: true
     volumes:

molecule/source/molecule.yml

@@ -34,7 +34,7 @@ platforms:
     volumes:
       - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
     command: "/sbin/init"
-  - name: amazonlinux
+  - name: amazonlinux-2
     image: amazonlinux:2
     dockerfile: ../common/Dockerfile.j2
     privileged: true