Use local role name in Molecule tests (#409)

* And update the platforms used in the various Molecule scenarios.
nginxinc · Mar 6, 2024 · 2651dcb · 2651dcb
1 parent db4d8b5
commit 2651dcb
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,11 @@ BUG FIXES:
 
 - Fix incompatibility when using the `listen` directive and setting both the `quic` and `so_keepalive` parameters.
 
+CI/CD:
+
+- Update the platforms used in the various Molecule scenarios.
+- Use the local role name (`ansible-role-nginx-config`) instead of the fully qualified role name (`nginxinc.nginx_config`) in Molecule to ensure tests always work as intended in environments where the role has been already installed beforehand.
+
 ## 0.7.1 (October 3rd, 2023)
 
 ENHANCEMENTS:

diff --git a/molecule/cleanup_module/converge.yml b/molecule/cleanup_module/converge.yml
@@ -4,7 +4,7 @@
   tasks:
     - name: Configure NGINX
       ansible.builtin.include_role:
-        name: nginxinc.nginx_config
+        name: ansible-role-nginx-config
       vars:
         nginx_config_debug_output: true
 

diff --git a/molecule/cleanup_module/molecule.yml b/molecule/cleanup_module/molecule.yml
@@ -9,8 +9,8 @@ lint: |
   set -e
   ansible-lint --force-color
 platforms:
-  - name: alpine-3.17
-    image: alpine:3.17
+  - name: alpine-3.19
+    image: alpine:3.19
     dockerfile: ../common/Dockerfile.j2
     privileged: true
     cgroupns_mode: host
@@ -26,7 +26,7 @@ platforms:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /sbin/init
   - name: rhel-9
-    image: redhat/ubi9:9.1.0
+    image: redhat/ubi9:9.3
     dockerfile: ../common/Dockerfile.j2
     privileged: true
     cgroupns_mode: host

diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
@@ -4,7 +4,7 @@
   tasks:
     - name: Configure NGINX
       ansible.builtin.include_role:
-        name: nginxinc.nginx_config
+        name: ansible-role-nginx-config
       vars:
         nginx_config_debug_output: true
 

diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
@@ -9,8 +9,8 @@ lint: |
   set -e
   ansible-lint --force-color
 platforms:
-  - name: alpine-3.17
-    image: alpine:3.17
+  - name: alpine-3.19
+    image: alpine:3.19
     dockerfile: ../common/Dockerfile.j2
     privileged: true
     cgroupns_mode: host
@@ -26,7 +26,7 @@ platforms:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /sbin/init
   - name: rhel-9
-    image: redhat/ubi9:9.1.0
+    image: redhat/ubi9:9.3
     dockerfile: ../common/Dockerfile.j2
     privileged: true
     cgroupns_mode: host

diff --git a/molecule/plus/converge.yml b/molecule/plus/converge.yml
@@ -4,7 +4,7 @@
   tasks:
     - name: Configure NGINX
       ansible.builtin.include_role:
-        name: nginxinc.nginx_config
+        name: ansible-role-nginx-config
       vars:
         nginx_config_debug_output: true
 

diff --git a/molecule/plus/prepare.yml b/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: ../common/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: ../common/files/license/nginx-repo.key

diff --git a/molecule/push/converge.yml b/molecule/push/converge.yml
@@ -4,7 +4,7 @@
   tasks:
     - name: Configure NGINX
       ansible.builtin.include_role:
-        name: nginxinc.nginx_config
+        name: ansible-role-nginx-config
       vars:
         nginx_config_debug_output: true
 

diff --git a/molecule/push/molecule.yml b/molecule/push/molecule.yml
@@ -9,8 +9,8 @@ lint: |
   set -e
   ansible-lint --force-color
 platforms:
-  - name: alpine-3.17
-    image: alpine:3.17
+  - name: alpine-3.19
+    image: alpine:3.19
     dockerfile: ../common/Dockerfile.j2
     privileged: true
     cgroupns_mode: host
@@ -26,7 +26,7 @@ platforms:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /sbin/init
   - name: rhel-9
-    image: redhat/ubi9:9.1.0
+    image: redhat/ubi9:9.3
     dockerfile: ../common/Dockerfile.j2
     privileged: true
     cgroupns_mode: host