Tweak Molecule tests to account for the current supported platforms (#383)

CHANGELOG.md

@@ -21,7 +21,7 @@ ENHANCEMENTS:
 *   Only run GitHub actions Galaxy CI/CD workflow when a new release is published.
 *   Specify GitHub actions Ubuntu release.
 *   Minor GitHub template tweaks, including the creation of a SECURITY doc.
-*   Update list of supported platforms.
+*   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.7`, Ansible Lint to `5.0.5`, Molecule to `3.3.0`, yamllint to `1.26.0` and Docker Python SDK to `4.4.4`.
 *   Consolidate Molecule testing scenarios to address changes introduced in Ansible Lint `5.*`.
 *   Override of systemd `Restart` value by using proper `nginx_service_restart` variable.

README.md

@@ -65,11 +65,11 @@ Alpine:
   - 3.10
   - 3.11
   - 3.12
+  - 3.13
 CentOS:
   - 7.4+
   - 8
 Debian:
-  - stretch
   - buster
 Red Hat:
   - 7.4+
@@ -99,7 +99,6 @@ CentOS:
   - 7.4+
   - 8
 Debian:
-  - stretch
   - buster
 FreeBSD:
   - 11.2+

meta/main.yml

@@ -22,7 +22,6 @@ galaxy_info:
         - any
     - name: Debian
       versions:
-        - stretch
         - buster
     - name: EL
       versions:

molecule/default/converge.yml

@@ -4,15 +4,15 @@
   pre_tasks:
     - name: Set repo if Alpine
       set_fact:
-        version: "=1.19.1-r1"
+        version: "=1.19.8-r1"
       when: ansible_facts['os_family'] == "Alpine"
     - name: Set repo if Debian
       set_fact:
-        version: "=1.19.1-1~{{ ansible_facts['distribution_release'] }}"
+        version: "=1.19.8-1~{{ ansible_facts['distribution_release'] }}"
       when: ansible_facts['os_family'] == "Debian"
     - name: Set repo if Red Hat
       set_fact:
-        version: "-1.19.1-1.el{{ ansible_facts['distribution_major_version'] }}.ngx"
+        version: "-1.19.8-1.el{{ ansible_facts['distribution_major_version'] }}.ngx"
       when: ansible_facts['os_family'] == "RedHat"
     - name: Enable NGINX @CentOS-AppStream dnf modules
       shell:

molecule/default/molecule.yml

@@ -27,6 +27,13 @@ platforms:
     volumes:
       - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
     command: "/sbin/init"
+  - name: alpine-3.13
+    image: alpine:3.13
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/sbin/init"
   - name: centos-7
     image: centos:7
     dockerfile: ../common/Dockerfile.j2
@@ -41,13 +48,6 @@ platforms:
     volumes:
       - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
     command: "/usr/sbin/init"
-  - name: debian-stretch
-    image: debian:stretch-slim
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/sbin/init"
   - name: debian-buster
     image: debian:buster-slim
     dockerfile: ../common/Dockerfile.j2

molecule/module/molecule.yml

@@ -27,6 +27,13 @@ platforms:
     volumes:
       - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
     command: "/sbin/init"
+  - name: alpine-3.13
+    image: alpine:3.13
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/sbin/init"
   - name: centos-7
     image: centos:7
     dockerfile: ../common/Dockerfile.j2
@@ -41,13 +48,6 @@ platforms:
     volumes:
       - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
     command: "/usr/sbin/init"
-  - name: debian-stretch
-    image: debian:stretch-slim
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/sbin/init"
   - name: debian-buster
     image: debian:buster-slim
     dockerfile: ../common/Dockerfile.j2

molecule/plus/molecule.yml

@@ -7,14 +7,14 @@ lint: |
   ansible-lint --force-color
 platforms:
   - name: alpine-3.10
-    image: python:alpine3.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: python:alpine3.11
+    image: alpine:3.11
     dockerfile: ../common/Dockerfile.j2
     privileged: true
     volumes:
@@ -41,13 +41,6 @@ platforms:
     volumes:
       - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
     command: "/usr/sbin/init"
-  - name: debian-stretch
-    image: debian:stretch-slim
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/sbin/init"
   - name: debian-buster
     image: debian:buster-slim
     dockerfile: ../common/Dockerfile.j2

molecule/source/molecule.yml

@@ -27,6 +27,13 @@ platforms:
     volumes:
       - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
     command: "/sbin/init"
+  - name: alpine-3.13
+    image: alpine:3.13
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/sbin/init"
   - name: centos-7
     image: centos:7
     dockerfile: ../common/Dockerfile.j2
@@ -41,13 +48,6 @@ platforms:
     volumes:
       - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
     command: "/usr/sbin/init"
-  - name: debian-stretch
-    image: debian:stretch-slim
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/sbin/init"
   - name: debian-buster
     image: debian:buster-slim
     dockerfile: ../common/Dockerfile.j2