Skip to content

Commit

Permalink
Use local role name in Molecule tests (#682)
Browse files Browse the repository at this point in the history
  • Loading branch information
alessfg authored Dec 23, 2023
1 parent 12838c7 commit 6976aec
Show file tree
Hide file tree
Showing 14 changed files with 14 additions and 13 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ 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.

## 0.24.2 (October 3rd, 2023)

Expand Down
2 changes: 1 addition & 1 deletion molecule/default/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
tasks:
- name: Install NGINX
ansible.builtin.include_role:
name: nginxinc.nginx
name: ansible-role-nginx
vars:
nginx_modules:
- geoip
Expand Down
2 changes: 1 addition & 1 deletion molecule/distribution/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
tasks:
- name: Install NGINX
ansible.builtin.include_role:
name: nginxinc.nginx
name: ansible-role-nginx
vars:
nginx_install_from: os_repository
2 changes: 1 addition & 1 deletion molecule/downgrade-plus/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
tasks:
- name: Install NGINX
ansible.builtin.include_role:
name: nginxinc.nginx
name: ansible-role-nginx
vars:
nginx_type: plus
nginx_license:
Expand Down
2 changes: 1 addition & 1 deletion molecule/downgrade/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
tasks:
- name: Install NGINX
ansible.builtin.include_role:
name: nginxinc.nginx
name: ansible-role-nginx
vars:
nginx_version: "{{ version }}"
2 changes: 1 addition & 1 deletion molecule/plus/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
tasks:
- name: Install NGINX Plus
ansible.builtin.include_role:
name: nginxinc.nginx
name: ansible-role-nginx
vars:
nginx_type: plus
nginx_license:
Expand Down
2 changes: 1 addition & 1 deletion molecule/source-version/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
tasks:
- name: Install NGINX from source
ansible.builtin.include_role:
name: nginxinc.nginx
name: ansible-role-nginx
vars:
nginx_install_from: source
nginx_branch: stable
Expand Down
2 changes: 1 addition & 1 deletion molecule/source/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
tasks:
- name: Install NGINX from source
ansible.builtin.include_role:
name: nginxinc.nginx
name: ansible-role-nginx
vars:
nginx_install_from: source
nginx_branch: stable
Expand Down
2 changes: 1 addition & 1 deletion molecule/stable/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
tasks:
- name: Install NGINX
ansible.builtin.include_role:
name: nginxinc.nginx
name: ansible-role-nginx
vars:
nginx_branch: stable
2 changes: 1 addition & 1 deletion molecule/uninstall-plus/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
tasks:
- name: Uninstall NGINX
ansible.builtin.include_role:
name: nginxinc.nginx
name: ansible-role-nginx
vars:
nginx_type: plus
nginx_setup_license: false
Expand Down
2 changes: 1 addition & 1 deletion molecule/uninstall/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
tasks:
- name: Uninstall NGINX
ansible.builtin.include_role:
name: nginxinc.nginx
name: ansible-role-nginx
vars:
nginx_setup: uninstall
2 changes: 1 addition & 1 deletion molecule/upgrade-plus/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
tasks:
- name: Install NGINX Plus
ansible.builtin.include_role:
name: nginxinc.nginx
name: ansible-role-nginx
vars:
nginx_type: plus
nginx_license:
Expand Down
2 changes: 1 addition & 1 deletion molecule/upgrade/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
tasks:
- name: Install NGINX
ansible.builtin.include_role:
name: nginxinc.nginx
name: ansible-role-nginx
vars:
nginx_setup: upgrade
2 changes: 1 addition & 1 deletion molecule/version/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
tasks:
- name: Install NGINX
ansible.builtin.include_role:
name: nginxinc.nginx
name: ansible-role-nginx
vars:
nginx_version: "{{ ngx_version }}"
nginx_modules:
Expand Down

0 comments on commit 6976aec

Please sign in to comment.