Skip to content

Commit 2651dcb

Browse files
authored
Use local role name in Molecule tests (#409)
* And update the platforms used in the various Molecule scenarios.
1 parent db4d8b5 commit 2651dcb

File tree

9 files changed

+20
-15
lines changed

9 files changed

+20
-15
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ BUG FIXES:
66

77
- Fix incompatibility when using the `listen` directive and setting both the `quic` and `so_keepalive` parameters.
88

9+
CI/CD:
10+
11+
- Update the platforms used in the various Molecule scenarios.
12+
- 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.
13+
914
## 0.7.1 (October 3rd, 2023)
1015

1116
ENHANCEMENTS:

molecule/cleanup_module/converge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
tasks:
55
- name: Configure NGINX
66
ansible.builtin.include_role:
7-
name: nginxinc.nginx_config
7+
name: ansible-role-nginx-config
88
vars:
99
nginx_config_debug_output: true
1010

molecule/cleanup_module/molecule.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ lint: |
99
set -e
1010
ansible-lint --force-color
1111
platforms:
12-
- name: alpine-3.17
13-
image: alpine:3.17
12+
- name: alpine-3.19
13+
image: alpine:3.19
1414
dockerfile: ../common/Dockerfile.j2
1515
privileged: true
1616
cgroupns_mode: host
@@ -26,7 +26,7 @@ platforms:
2626
- /sys/fs/cgroup:/sys/fs/cgroup:rw
2727
command: /sbin/init
2828
- name: rhel-9
29-
image: redhat/ubi9:9.1.0
29+
image: redhat/ubi9:9.3
3030
dockerfile: ../common/Dockerfile.j2
3131
privileged: true
3232
cgroupns_mode: host

molecule/default/converge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
tasks:
55
- name: Configure NGINX
66
ansible.builtin.include_role:
7-
name: nginxinc.nginx_config
7+
name: ansible-role-nginx-config
88
vars:
99
nginx_config_debug_output: true
1010

molecule/default/molecule.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ lint: |
99
set -e
1010
ansible-lint --force-color
1111
platforms:
12-
- name: alpine-3.17
13-
image: alpine:3.17
12+
- name: alpine-3.19
13+
image: alpine:3.19
1414
dockerfile: ../common/Dockerfile.j2
1515
privileged: true
1616
cgroupns_mode: host
@@ -26,7 +26,7 @@ platforms:
2626
- /sys/fs/cgroup:/sys/fs/cgroup:rw
2727
command: /sbin/init
2828
- name: rhel-9
29-
image: redhat/ubi9:9.1.0
29+
image: redhat/ubi9:9.3
3030
dockerfile: ../common/Dockerfile.j2
3131
privileged: true
3232
cgroupns_mode: host

molecule/plus/converge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
tasks:
55
- name: Configure NGINX
66
ansible.builtin.include_role:
7-
name: nginxinc.nginx_config
7+
name: ansible-role-nginx-config
88
vars:
99
nginx_config_debug_output: true
1010

molecule/plus/prepare.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
hosts: localhost
44
gather_facts: false
55
tasks:
6-
- name: Create ephemeral license certificate file from b64 decoded env var # noqa template-instead-of-copy
6+
- name: Create ephemeral license certificate file from b64 decoded env var
77
ansible.builtin.copy:
88
content: "{{ lookup('env', 'NGINX_CRT') | b64decode }}"
99
dest: ../common/files/license/nginx-repo.crt
1010
force: false
1111
mode: "0444"
1212

13-
- name: Create ephemeral license key file from b64 decoded env var # noqa template-instead-of-copy
13+
- name: Create ephemeral license key file from b64 decoded env var
1414
ansible.builtin.copy:
1515
content: "{{ lookup('env', 'NGINX_KEY') | b64decode }}"
1616
dest: ../common/files/license/nginx-repo.key

molecule/push/converge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
tasks:
55
- name: Configure NGINX
66
ansible.builtin.include_role:
7-
name: nginxinc.nginx_config
7+
name: ansible-role-nginx-config
88
vars:
99
nginx_config_debug_output: true
1010

molecule/push/molecule.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ lint: |
99
set -e
1010
ansible-lint --force-color
1111
platforms:
12-
- name: alpine-3.17
13-
image: alpine:3.17
12+
- name: alpine-3.19
13+
image: alpine:3.19
1414
dockerfile: ../common/Dockerfile.j2
1515
privileged: true
1616
cgroupns_mode: host
@@ -26,7 +26,7 @@ platforms:
2626
- /sys/fs/cgroup:/sys/fs/cgroup:rw
2727
command: /sbin/init
2828
- name: rhel-9
29-
image: redhat/ubi9:9.1.0
29+
image: redhat/ubi9:9.3
3030
dockerfile: ../common/Dockerfile.j2
3131
privileged: true
3232
cgroupns_mode: host

0 commit comments

Comments
 (0)