Update Molecule to remove Alpine Linux 3.15

CHANGELOG.md

@@ -4,8 +4,8 @@
 
 FEATURES:
 
-- Add Alpine Linux 3.19 to the list of NGINX Plus tested and supported distributions.
-- Remove Alpine Linux 3.15 from the list of NGINX Plus tested and supported distributions.
+- Add Alpine Linux 3.19 to the list of NGINX Open Source and NGINX Plus tested and supported distributions.
+- Remove Alpine Linux 3.15 from the list of NGINX Open Source and NGINX Plus tested and supported distributions.
 
 ENHANCEMENTS:
 
@@ -19,7 +19,8 @@ BUG FIXES:
 CI/CD:
 
 - Add Molecule tests for NGINX Amplify.
-- Use the local role name (`ansible-role-nginx`) instead of the  fully qualified role name (`nginxinc.nginx`) in Molecule to ensure tests always work as intended in environments where the role has been already installed beforehand.
+- Update the RHEL based tests to use the latest UBI release.
+- Use the local role name (`ansible-role-nginx`) instead of the fully qualified role name (`nginxinc.nginx`) in Molecule to ensure tests always work as intended in environments where the role has been already installed beforehand.
 
 ## 0.24.2 (October 3rd, 2023)
 

README.md

@@ -94,10 +94,10 @@ AlmaLinux:
   - 8
   - 9
 Alpine:
-  - 3.15
   - 3.16
   - 3.17
   - 3.18
+  - 3.19
 Amazon Linux:
   - 2
 CentOS:

molecule/amplify/cleanup.yml

@@ -14,7 +14,7 @@
 
         - name: Containers are not up, quit from here
           ansible.builtin.fail:
-          when: container['failed']
+          when: container['failed'] | bool
 
         - name: Gather facts
           ansible.builtin.setup:

molecule/amplify/molecule.yml

@@ -28,7 +28,7 @@ platforms:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
   - name: rhel-9
-    image: redhat/ubi9:9.1.0
+    image: redhat/ubi9:9.3
     # platform: aarch64
     dockerfile: ../common/Dockerfile.j2
     privileged: true

molecule/default/molecule.yml

@@ -18,14 +18,6 @@ platforms:
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
-  - name: alpine-3.15
-    image: alpine:3.15
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    cgroupns_mode: host
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:rw
-    command: /sbin/init
   - name: alpine-3.16
     image: alpine:3.16
     platform: x86_64
@@ -52,6 +44,14 @@ platforms:
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /sbin/init
+  - name: alpine-3.19
+    image: alpine:3.19
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    cgroupns_mode: host
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    command: /sbin/init
   - name: amazonlinux-2
     image: amazonlinux:2
     platform: x86_64
@@ -121,7 +121,7 @@ platforms:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
   - name: rhel-8
-    image: redhat/ubi8:8.7
+    image: redhat/ubi8:8.9
     # platform: s390x
     dockerfile: ../common/Dockerfile.j2
     privileged: true
@@ -130,7 +130,7 @@ platforms:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
   - name: rhel-9
-    image: redhat/ubi9:9.1.0
+    image: redhat/ubi9:9.3
     # platform: aarch64
     dockerfile: ../common/Dockerfile.j2
     privileged: true

molecule/distribution/molecule.yml

@@ -18,14 +18,6 @@ platforms: # The RHEL UBI 7 image fails to install some NGINX dependencies when
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
-  - name: alpine-3.15
-    image: alpine:3.15
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    cgroupns_mode: host
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:rw
-    command: /sbin/init
   - name: alpine-3.16
     image: alpine:3.16
     platform: x86_64
@@ -52,6 +44,14 @@ platforms: # The RHEL UBI 7 image fails to install some NGINX dependencies when
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /sbin/init
+  - name: alpine-3.19
+    image: alpine:3.19
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    cgroupns_mode: host
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    command: /sbin/init
   - name: amazonlinux-2
     image: amazonlinux:2
     platform: x86_64
@@ -121,7 +121,7 @@ platforms: # The RHEL UBI 7 image fails to install some NGINX dependencies when
   #     - /sys/fs/cgroup:/sys/fs/cgroup:rw
   #   command: /usr/sbin/init
   - name: rhel-8
-    image: redhat/ubi8:8.7
+    image: redhat/ubi8:8.9
     # platform: s390x
     dockerfile: ../common/Dockerfile.j2
     privileged: true
@@ -130,7 +130,7 @@ platforms: # The RHEL UBI 7 image fails to install some NGINX dependencies when
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
   - name: rhel-9
-    image: redhat/ubi9:9.1.0
+    image: redhat/ubi9:9.3
     # platform: aarch64
     dockerfile: ../common/Dockerfile.j2
     privileged: true

molecule/downgrade-plus/converge.yml

@@ -5,18 +5,22 @@
     - name: Set repo if Alpine
       ansible.builtin.set_fact:
         version: =30-r1
+        cacheable: true
       when: ansible_facts['os_family'] == "Alpine"
     - name: Set repo if Debian
       ansible.builtin.set_fact:
         version: =30-1~{{ ansible_facts['distribution_release'] }}
+        cacheable: true
       when: ansible_facts['os_family'] == "Debian"
     - name: Set repo if Red Hat
       ansible.builtin.set_fact:
         version: -30-1.{{ (ansible_facts['distribution'] == "Amazon") | ternary('amzn2', ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx
+        cacheable: true
       when: ansible_facts['os_family'] == "RedHat"
     - name: Set repo if SLES
       ansible.builtin.set_fact:
         version: =30-1.sles{{ ansible_facts['distribution_major_version'] }}.ngx
+        cacheable: true
       when: ansible_facts['os_family'] == "Suse"
   tasks:
     - name: Install NGINX

molecule/downgrade-plus/molecule.yml

@@ -121,7 +121,7 @@ platforms: # Alpine 3.19 only has one version of NGINX Plus available (at the mo
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
   - name: rhel-8
-    image: redhat/ubi8:8.7
+    image: redhat/ubi8:8.9
     # platform: s390x
     dockerfile: ../common/Dockerfile.j2
     privileged: true
@@ -130,7 +130,7 @@ platforms: # Alpine 3.19 only has one version of NGINX Plus available (at the mo
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
   - name: rhel-9
-    image: redhat/ubi9:9.1.0
+    image: redhat/ubi9:9.3
     # platform: aarch64
     dockerfile: ../common/Dockerfile.j2
     privileged: true
@@ -187,3 +187,8 @@ provisioner:
     prepare: prepare.yml
     converge: converge.yml
     verify: verify.yml
+  config_options:
+    defaults:
+      fact_caching: jsonfile
+      fact_caching_connection: /tmp/facts_cache
+      fact_caching_timeout: 7200

molecule/downgrade-plus/prepare.yml

@@ -3,14 +3,14 @@
   hosts: localhost
   gather_facts: false
   tasks:
-    - name: Create ephemeral license certificate file from b64 decoded env var # noqa template-instead-of-copy
+    - name: Create ephemeral license certificate file from b64 decoded env var
       ansible.builtin.copy:
         content: "{{ lookup('env', 'NGINX_CRT') | b64decode }}"
         dest: ../../files/license/nginx-repo.crt
         force: false
         mode: "0444"
 
-    - name: Create ephemeral license key file from b64 decoded env var # noqa template-instead-of-copy
+    - name: Create ephemeral license key file from b64 decoded env var
       ansible.builtin.copy:
         content: "{{ lookup('env', 'NGINX_KEY') | b64decode }}"
         dest: ../../files/license/nginx-repo.key
@@ -22,7 +22,7 @@
   tasks:
     - name: Install NGINX
       ansible.builtin.include_role:
-        name: nginxinc.nginx
+        name: ansible-role-nginx
       vars:
         nginx_type: plus
         nginx_license:

molecule/downgrade-plus/verify.yml

@@ -29,5 +29,5 @@
       args:
         chdir: "{{ ((ansible_facts['system'] | lower is not search('bsd')) | ternary('/etc/nginx', '/usr/local/sbin')) }}"
       changed_when: false
-      register: version
-      failed_when: version is not search('30')
+      register: current_version
+      failed_when: current_version is not search(version | regex_search('[0-9]+'))

molecule/downgrade/converge.yml

@@ -4,19 +4,23 @@
   pre_tasks:
     - name: Set repo if Alpine
       ansible.builtin.set_fact:
-        version: =1.25.1-r1
+        version: =1.25.3-r1
+        cacheable: true
       when: ansible_facts['os_family'] == "Alpine"
     - name: Set repo if Debian
       ansible.builtin.set_fact:
-        version: =1.25.1-1~{{ ansible_facts['distribution_release'] }}
+        version: =1.25.3-1~{{ ansible_facts['distribution_release'] }}
+        cacheable: true
       when: ansible_facts['os_family'] == "Debian"
     - name: Set repo if Red Hat
       ansible.builtin.set_fact:
-        version: -1.25.1-1.{{ (ansible_facts['distribution'] == "Amazon") | ternary('amzn2', ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx
+        version: -1.25.3-1.{{ (ansible_facts['distribution'] == "Amazon") | ternary('amzn2', ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx
+        cacheable: true
       when: ansible_facts['os_family'] == "RedHat"
     - name: Set repo if SLES
       ansible.builtin.set_fact:
-        version: =1.25.1-1.sles{{ ansible_facts['distribution_major_version'] }}.ngx
+        version: =1.25.3-1.sles{{ ansible_facts['distribution_major_version'] }}.ngx
+        cacheable: true
       when: ansible_facts['os_family'] == "Suse"
   tasks:
     - name: Install NGINX

molecule/downgrade/molecule.yml

@@ -18,14 +18,6 @@ platforms:
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
-  - name: alpine-3.15
-    image: alpine:3.15
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    cgroupns_mode: host
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:rw
-    command: /sbin/init
   - name: alpine-3.16
     image: alpine:3.16
     platform: x86_64
@@ -52,6 +44,14 @@ platforms:
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /sbin/init
+  - name: alpine-3.19
+    image: alpine:3.19
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    cgroupns_mode: host
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    command: /sbin/init
   - name: amazonlinux-2
     image: amazonlinux:2
     platform: x86_64
@@ -121,7 +121,7 @@ platforms:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
   - name: rhel-8
-    image: redhat/ubi8:8.7
+    image: redhat/ubi8:8.9
     # platform: s390x
     dockerfile: ../common/Dockerfile.j2
     privileged: true
@@ -130,7 +130,7 @@ platforms:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
   - name: rhel-9
-    image: redhat/ubi9:9.1.0
+    image: redhat/ubi9:9.3
     # platform: aarch64
     dockerfile: ../common/Dockerfile.j2
     privileged: true
@@ -196,3 +196,8 @@ provisioner:
     prepare: prepare.yml
     converge: converge.yml
     verify: verify.yml
+  config_options:
+    defaults:
+      fact_caching: jsonfile
+      fact_caching_connection: /tmp/facts_cache
+      fact_caching_timeout: 7200

molecule/downgrade/prepare.yml

@@ -4,4 +4,4 @@
   tasks:
     - name: Install NGINX
       ansible.builtin.include_role:
-        name: nginxinc.nginx
+        name: ansible-role-nginx

molecule/downgrade/verify.yml

@@ -29,5 +29,5 @@
       args:
         chdir: "{{ ((ansible_facts['system'] | lower is not search('bsd')) | ternary('/etc/nginx', '/usr/local/sbin')) }}"
       changed_when: false
-      register: version
-      failed_when: version is not search('1.25.1')
+      register: current_version
+      failed_when: current_version is not search(version | regex_search('([0-9]+\\.){2}[0-9]+'))

molecule/plus/molecule.yml

@@ -121,7 +121,7 @@ platforms:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
   - name: rhel-8
-    image: redhat/ubi8:8.7
+    image: redhat/ubi8:8.9
     # platform: s390x
     dockerfile: ../common/Dockerfile.j2
     privileged: true
@@ -130,7 +130,7 @@ platforms:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
   - name: rhel-9
-    image: redhat/ubi9:9.1.0
+    image: redhat/ubi9:9.3
     # platform: aarch64
     dockerfile: ../common/Dockerfile.j2
     privileged: true

molecule/plus/prepare.yml

@@ -3,14 +3,14 @@
   hosts: localhost
   gather_facts: false
   tasks:
-    - name: Create ephemeral license certificate file from b64 decoded env var # noqa template-instead-of-copy
+    - name: Create ephemeral license certificate file from b64 decoded env var
       ansible.builtin.copy:
         content: "{{ lookup('env', 'NGINX_CRT') | b64decode }}"
         dest: ../../files/license/nginx-repo.crt
         force: false
         mode: "0444"
 
-    - name: Create ephemeral license key file from b64 decoded env var # noqa template-instead-of-copy
+    - name: Create ephemeral license key file from b64 decoded env var
       ansible.builtin.copy:
         content: "{{ lookup('env', 'NGINX_KEY') | b64decode }}"
         dest: ../../files/license/nginx-repo.key