Support the latest NGINX Plus distro updates

CHANGELOG.md

@@ -4,10 +4,10 @@
 
 FEATURES:
 
-* Add support for NGINX OSS on Ubuntu jammy (22.04).
+* Add Ubuntu jammy (22.04) to the NGINX list of tested and supported platforms.
+* Add RHEL 9 to the NGINX list of tested and supported platforms.
+* Add Alpine Linux 3.16 to the NGINX list of tested and supported platforms (and remove Alpine Linux 3.12).
 * Add CODEOWNERS file.
-* Add RHEL 9 to the NGINX OSS list of tested and supported platforms.
-* Add Alpine Linux 3.16 to the NGINX OSS list of tested and supported platforms (and remove Alpine Linux 3.12).
 
 ENHANCEMENTS:
 

README.md

@@ -102,10 +102,10 @@ Ubuntu:
 
 ```yaml
 Alpine:
-  - 3.12
   - 3.13
   - 3.14
   - 3.15
+  - 3.16
 Amazon Linux 2:
   - any
 CentOS:
@@ -121,12 +121,14 @@ Oracle Linux:
 Red Hat:
   - 7.4+
   - 8
+  - 9
 SUSE/SLES:
   - 12
   - 15
 Ubuntu:
   - bionic (18.04)
   - focal (20.04)
+  - jammy (22.04)
 ```
 
 ### NGINX Amplify Agent

molecule/plus/molecule.yml

@@ -6,13 +6,6 @@ lint: |
   yamllint .
   ansible-lint --force-color
 platforms:
-  - name: alpine-3.12
-    image: alpine:3.12
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/sbin/init"
   - name: alpine-3.13
     image: alpine:3.13
     dockerfile: ../common/Dockerfile.j2
@@ -34,6 +27,13 @@ platforms:
     volumes:
       - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
     command: "/sbin/init"
+  - name: alpine-3.16
+    image: alpine:3.16
+    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
@@ -62,6 +62,13 @@ platforms:
     volumes:
       - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
     command: "/usr/sbin/init"
+  - name: rhel-9
+    image: registry.access.redhat.com/ubi9/ubi:9.0.0
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/usr/sbin/init"
   - name: debian-buster
     image: debian:buster-slim
     dockerfile: ../common/Dockerfile.j2
@@ -90,6 +97,13 @@ platforms:
     volumes:
       - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
     command: "/sbin/init"
+  - name: ubuntu-jammy
+    image: ubuntu:jammy
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/sbin/init"
 provisioner:
   name: ansible
   playbooks:

molecule/uninstall_plus/molecule.yml

@@ -6,13 +6,6 @@ lint: |
   yamllint .
   ansible-lint --force-color
 platforms:  # Ubuntu bionic and Debian buster result in a segmentation fault error as of Ansible core 2.13
-  - name: alpine-3.12
-    image: alpine:3.12
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/sbin/init"
   - name: alpine-3.13
     image: alpine:3.13
     dockerfile: ../common/Dockerfile.j2
@@ -34,6 +27,13 @@ platforms:  # Ubuntu bionic and Debian buster result in a segmentation fault err
     volumes:
       - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
     command: "/sbin/init"
+  - name: alpine-3.16
+    image: alpine:3.16
+    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
@@ -62,6 +62,13 @@ platforms:  # Ubuntu bionic and Debian buster result in a segmentation fault err
     volumes:
       - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
     command: "/usr/sbin/init"
+  - name: rhel-9
+    image: registry.access.redhat.com/ubi9/ubi:9.0.0
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/usr/sbin/init"
   - name: debian-bullseye
     image: debian:bullseye-slim
     dockerfile: ../common/Dockerfile.j2
@@ -76,6 +83,13 @@ platforms:  # Ubuntu bionic and Debian buster result in a segmentation fault err
     volumes:
       - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
     command: "/sbin/init"
+  - name: ubuntu-jammy
+    image: ubuntu:jammy
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/sbin/init"
 provisioner:
   name: ansible
   playbooks: