Skip to content

Commit c9c50e5

Browse files
authored
Explicitly set molecule-plugins and ansible-compat releases (#602)
* Bump Ansible collections * Add pre-releases to Release Drafter
1 parent 4de3b67 commit c9c50e5

File tree

10 files changed

+25
-43
lines changed

10 files changed

+25
-43
lines changed

.github/release-drafter.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
name-template: "$RESOLVED_VERSION"
33
tag-template: "$RESOLVED_VERSION"
4+
include-pre-releases: true
45
categories:
56
- title: "💣 Breaking Changes"
67
labels:
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
22
collections:
33
- name: ansible.posix
4-
version: 1.4.0
4+
version: 1.5.2
55
- name: community.general
6-
version: 6.2.0
6+
version: 6.4.0
77
- name: community.crypto # Only required if you plan to install NGINX Plus
8-
version: 2.10.0
8+
version: 2.13.0
99
- name: community.docker # Only required if you plan to use Molecule
10-
version: 3.4.0
10+
version: 3.4.5
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
ansible-core==2.14.4
22
jinja2==3.1.2
3+
ansible-compat==3.0.2
34
ansible-lint==6.15.0
45
yamllint==1.31.0
5-
molecule[docker]==4.0.4
6-
docker==6.0.1
6+
molecule==4.0.4
7+
molecule-plugins[docker]==23.0.0
8+
docker==6.1.1

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,22 @@
22

33
## 0.24.1 (Unreleased)
44

5+
FEATURES:
6+
7+
- Remove Alpine Linux 3.13 from the list of NGINX Plus tested and supported distributions.
8+
59
ENHANCEMENTS:
610

711
- Refactor the OSS BSD installation process to consolidate tasks and avoid Ansible Lint warnings.
812
- Refactor handlers to avoid Ansible Lint warnings.
913
- Enable SELinux configuration tasks on Oracle Linux OS.
14+
- Bump the Ansible `ansible.posix` collection to `1.5.2`, `community.general` collection to `6.6.0`, `community.crypto` collection to `2.13.0` and `community.docker` collection to `3.4.5`.
15+
16+
CI/CD:
17+
18+
- Replace `molecule[docker]` with `molecule` and `molecule-plugins[docker]`.
19+
- Explicitly set the `ansible-compat` version.
20+
- Add pre-releases to Release Drafter.
1021

1122
## 0.24.0 (January 29, 2023)
1223

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ If you wish to install NGINX Plus using this role, you will need to obtain an NG
2525
---
2626
collections:
2727
- name: ansible.posix
28-
version: 1.4.0
28+
version: 1.5.2
2929
- name: community.general
30-
version: 6.2.0
30+
version: 6.6.0
3131
- name: community.crypto # Only required if you plan to install NGINX Plus
32-
version: 2.10.0
32+
version: 2.13.0
3333
- name: community.docker # Only required if you plan to use Molecule (see below)
34-
version: 3.4.0
34+
version: 3.4.5
3535
```
3636
3737
**Note:** You can alternatively install the Ansible community distribution (what is known as the "old" Ansible) if you don't want to manage individual collections.

molecule/downgrade-plus/molecule.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,6 @@ platforms: # Alpine 3.17 only has one version of NGINX Plus available (at the mo
2121
volumes:
2222
- /sys/fs/cgroup:/sys/fs/cgroup:rw
2323
command: /usr/sbin/init
24-
- name: alpine-3.13
25-
image: alpine:3.13
26-
dockerfile: ../common/Dockerfile.j2
27-
privileged: true
28-
cgroupns_mode: host
29-
volumes:
30-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
31-
command: /sbin/init
3224
- name: alpine-3.14
3325
image: alpine:3.14
3426
dockerfile: ../common/Dockerfile.j2

molecule/plus/molecule.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,6 @@ platforms:
2121
volumes:
2222
- /sys/fs/cgroup:/sys/fs/cgroup:rw
2323
command: /usr/sbin/init
24-
- name: alpine-3.13
25-
image: alpine:3.13
26-
dockerfile: ../common/Dockerfile.j2
27-
privileged: true
28-
cgroupns_mode: host
29-
volumes:
30-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
31-
command: /sbin/init
3224
- name: alpine-3.14
3325
image: alpine:3.14
3426
dockerfile: ../common/Dockerfile.j2

molecule/uninstall-plus/molecule.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,6 @@ platforms: # Ubuntu bionic results in a segmentation fault error as of Ansible c
2121
volumes:
2222
- /sys/fs/cgroup:/sys/fs/cgroup:rw
2323
command: /usr/sbin/init
24-
- name: alpine-3.13
25-
image: alpine:3.13
26-
dockerfile: ../common/Dockerfile.j2
27-
privileged: true
28-
cgroupns_mode: host
29-
volumes:
30-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
31-
command: /sbin/init
3224
- name: alpine-3.14
3325
image: alpine:3.14
3426
dockerfile: ../common/Dockerfile.j2

molecule/upgrade-plus/molecule.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,6 @@ platforms: # Alpine 3.17 only has one version of NGINX Plus available (at the mo
2121
volumes:
2222
- /sys/fs/cgroup:/sys/fs/cgroup:rw
2323
command: /usr/sbin/init
24-
- name: alpine-3.13
25-
image: alpine:3.13
26-
dockerfile: ../common/Dockerfile.j2
27-
privileged: true
28-
cgroupns_mode: host
29-
volumes:
30-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
31-
command: /sbin/init
3224
- name: alpine-3.14
3325
image: alpine:3.14
3426
dockerfile: ../common/Dockerfile.j2

tasks/opensource/install-bsd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
- name: (NetBSD) {{ nginx_setup | capitalize }} NGINX package
6666
community.general.pkgin:
6767
name: nginx{{ nginx_version | default('') }}
68-
state: "{{ nginx_state }}"
68+
state: "{{ (nginx_state == 'uninstall') | ternary('absent', 'present') }}"
6969
when: nginx_bsd_install_packages | bool
7070
notify: (Handler) Run NGINX
7171

0 commit comments

Comments
 (0)