Skip to content

Commit 2bfc799

Browse files
authored
Update GitHub actions to use Ubuntu 22.04 (#298)
1 parent cdc0911 commit 2bfc799

File tree

10 files changed

+71
-37
lines changed

10 files changed

+71
-37
lines changed

.github/workflows/galaxy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ name: Ansible Galaxy import
88
jobs:
99
galaxy:
1010
name: Galaxy
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-22.04
1212
steps:
1313
- name: Check out the codebase
1414
uses: actions/checkout@v3

.github/workflows/molecule.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ name: Molecule CI/CD
1515
jobs:
1616
molecule:
1717
name: Molecule
18-
runs-on: ubuntu-20.04
18+
runs-on: ubuntu-22.04
1919
env:
2020
NGINX_CRT: ${{ secrets.NGINX_CRT }}
2121
NGINX_KEY: ${{ secrets.NGINX_KEY }}

.github/workflows/release-drafter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ name: Release Drafter
1313
jobs:
1414
update_release_draft:
1515
name: Update release draft
16-
runs-on: ubuntu-20.04
16+
runs-on: ubuntu-22.04
1717
steps:
1818
- uses: release-drafter/release-drafter@v5
1919
env:

CHANGELOG.md

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

77
GitHub actions should now correctly skip \*plus\* scenarios only when the NGINX Plus license secrets are not present.
88

9+
TESTS:
10+
11+
Update GitHub actions to run on Ubuntu 22.04 (and thus support `cgroups` v2).
12+
913
## 0.5.2 (October 17, 2022)
1014

1115
ENHANCEMENTS:

README.md

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@ This role configures NGINX Open Source and NGINX Plus on your target host.
1414

1515
### Ansible
1616

17-
* This role is developed and tested with [maintained](https://docs.ansible.com/ansible/devel/reference_appendices/release_and_maintenance.html) versions of Ansible core (above `2.11`).
17+
* This role is developed and tested with [maintained](https://docs.ansible.com/ansible/devel/reference_appendices/release_and_maintenance.html) versions of Ansible core (above `2.12`).
1818
* When using Ansible core, you will also need to install the following collections:
1919

2020
```yaml
2121
---
2222
collections:
23-
- name: community.general
24-
version: 5.5.0
2523
- name: ansible.posix
2624
version: 1.4.0
27-
- name: community.docker # Only required if you plan to use Molecule (see below)
25+
- name: community.general
26+
version: 5.5.0
27+
- name: community.docker # Only required if you plan to use Molecule (see below)
2828
version: 3.1.0
2929
```
3030
@@ -67,22 +67,31 @@ The NGINX config Ansible role supports all platforms supported by [NGINX Open So
6767
### NGINX Open Source
6868

6969
```yaml
70+
AlmaLinux:
71+
- 8
72+
- 9
7073
Alpine:
71-
- 3.13
7274
- 3.14
7375
- 3.15
7476
- 3.16
77+
- 3.17
7578
Amazon Linux:
7679
- 2
7780
CentOS:
7881
- 7.4+
7982
Debian:
80-
- buster (10)
8183
- bullseye (11)
84+
Oracle Linux:
85+
- 7
86+
- 8
87+
- 9
8288
Red Hat:
8389
- 7.4+
8490
- 8
8591
- 9
92+
Rocky Linux:
93+
- 8
94+
- 9
8695
SUSE/SLES:
8796
- 12
8897
- 15
@@ -96,17 +105,20 @@ Ubuntu:
96105
### NGINX Plus
97106

98107
```yaml
108+
AlmaLinux:
109+
- 8
110+
- 9
99111
Alpine:
100112
- 3.13
101113
- 3.14
102114
- 3.15
103115
- 3.16
116+
- 3.17
104117
Amazon Linux 2:
105118
- any
106119
CentOS:
107120
- 7.4+
108121
Debian:
109-
- buster (10)
110122
- bullseye (11)
111123
FreeBSD:
112124
- 12.1+
@@ -117,6 +129,9 @@ Red Hat:
117129
- 7.4+
118130
- 8
119131
- 9
132+
Rocky Linux:
133+
- 8
134+
- 9
120135
SUSE/SLES:
121136
- 12
122137
- 15
@@ -158,8 +173,6 @@ You can find the Ansible NGINX role to install NGINX OSS and NGINX Plus [here](h
158173

159174
You can find the Ansible NGINX App Protect role to install and configure NGINX App Protect WAF and NGINX App Protect DoS [here](https://github.com/nginxinc/ansible-role-nginx-app-protect).
160175

161-
You can find the Ansible NGINX Controller collection of roles to install and configure NGINX Controller [here](https://github.com/nginxinc/ansible-collection-nginx_controller).
162-
163176
You can find the Ansible NGINX Unit role to install NGINX Unit [here](https://github.com/nginxinc/ansible-role-nginx-unit).
164177

165178
## License

molecule/cleanup_module/molecule.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,35 @@ lint: |
99
set -e
1010
ansible-lint --force-color
1111
platforms:
12-
- name: alpine-3.13
13-
image: alpine:3.13
12+
- name: alpine-3.17
13+
image: alpine:3.17
1414
dockerfile: ../common/Dockerfile.j2
1515
privileged: true
16+
cgroupns_mode: host
1617
volumes:
1718
- /sys/fs/cgroup:/sys/fs/cgroup:rw
1819
command: /sbin/init
19-
- name: centos-7
20-
image: centos:7
20+
- name: rhel-9
21+
image: redhat/ubi9:9.1.0
2122
dockerfile: ../common/Dockerfile.j2
2223
privileged: true
24+
cgroupns_mode: host
2325
volumes:
2426
- /sys/fs/cgroup:/sys/fs/cgroup:rw
2527
command: /usr/sbin/init
26-
- name: debian-buster
27-
image: debian:buster-slim
28+
- name: debian-bullseye
29+
image: debian:bullseye-slim
2830
dockerfile: ../common/Dockerfile.j2
2931
privileged: true
32+
cgroupns_mode: host
3033
volumes:
3134
- /sys/fs/cgroup:/sys/fs/cgroup:rw
3235
command: /sbin/init
33-
- name: ubuntu-bionic
34-
image: ubuntu:bionic
36+
- name: ubuntu-jammy
37+
image: ubuntu:jammy
3538
dockerfile: ../common/Dockerfile.j2
3639
privileged: true
40+
cgroupns_mode: host
3741
volumes:
3842
- /sys/fs/cgroup:/sys/fs/cgroup:rw
3943
command: /sbin/init

molecule/common/Dockerfile.j2

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,14 @@ RUN \
2626
elif [ $(command -v yum) ]; then \
2727
yum makecache fast \
2828
&& yum install -y bash iproute initscripts sudo /usr/bin/python /usr/bin/python2-config vim yum-plugin-ovl \
29+
&& yum install -y http://mirror.centos.org/centos/7/os/x86_64/Packages/yum-plugin-copr-1.1.31-54.el7_8.noarch.rpm http://mirror.centos.org/centos/7/os/x86_64/Packages/libseccomp-2.3.1-4.el7.x86_64.rpm \
30+
&& yum copr enable -y jsynacek/systemd-backports-for-centos-7 \
31+
&& yum update --disableplugin=priorities -y systemd \
2932
&& sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf \
3033
&& yum clean all; \
3134
elif [ $(command -v zypper) ]; then \
3235
zypper refresh \
33-
&& zypper install -y bash iproute2 python3 sudo vim \
36+
&& zypper install -y bash iproute2 python3 sudo systemd systemd-sysvinit vim \
3437
&& zypper clean -a; \
3538
elif [ $(command -v apk) ]; then \
3639
apk update \

molecule/default/molecule.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,35 @@ lint: |
99
set -e
1010
ansible-lint --force-color
1111
platforms:
12-
- name: alpine-3.13
13-
image: alpine:3.13
12+
- name: alpine-3.17
13+
image: alpine:3.17
1414
dockerfile: ../common/Dockerfile.j2
1515
privileged: true
16+
cgroupns_mode: host
1617
volumes:
1718
- /sys/fs/cgroup:/sys/fs/cgroup:rw
1819
command: /sbin/init
19-
- name: centos-7
20-
image: centos:7
20+
- name: rhel-9
21+
image: redhat/ubi9:9.1.0
2122
dockerfile: ../common/Dockerfile.j2
2223
privileged: true
24+
cgroupns_mode: host
2325
volumes:
2426
- /sys/fs/cgroup:/sys/fs/cgroup:rw
2527
command: /usr/sbin/init
26-
- name: debian-buster
27-
image: debian:buster-slim
28+
- name: debian-bullseye
29+
image: debian:bullseye-slim
2830
dockerfile: ../common/Dockerfile.j2
2931
privileged: true
32+
cgroupns_mode: host
3033
volumes:
3134
- /sys/fs/cgroup:/sys/fs/cgroup:rw
3235
command: /sbin/init
33-
- name: ubuntu-bionic
34-
image: ubuntu:bionic
36+
- name: ubuntu-jammy
37+
image: ubuntu:jammy
3538
dockerfile: ../common/Dockerfile.j2
3639
privileged: true
40+
cgroupns_mode: host
3741
volumes:
3842
- /sys/fs/cgroup:/sys/fs/cgroup:rw
3943
command: /sbin/init

molecule/plus/molecule.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,15 @@ platforms:
1313
image: centos:7
1414
dockerfile: ../common/Dockerfile.j2
1515
privileged: true
16+
cgroupns_mode: host
1617
volumes:
1718
- /sys/fs/cgroup:/sys/fs/cgroup:rw
1819
command: /usr/sbin/init
1920
- name: ubuntu-bionic
2021
image: ubuntu:bionic
2122
dockerfile: ../common/Dockerfile.j2
2223
privileged: true
24+
cgroupns_mode: host
2325
volumes:
2426
- /sys/fs/cgroup:/sys/fs/cgroup:rw
2527
command: /sbin/init

molecule/stable_push/molecule.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,35 @@ lint: |
99
set -e
1010
ansible-lint --force-color
1111
platforms:
12-
- name: alpine-3.13
13-
image: alpine:3.13
12+
- name: alpine-3.17
13+
image: alpine:3.17
1414
dockerfile: ../common/Dockerfile.j2
1515
privileged: true
16+
cgroupns_mode: host
1617
volumes:
1718
- /sys/fs/cgroup:/sys/fs/cgroup:rw
1819
command: /sbin/init
19-
- name: centos-7
20-
image: centos:7
20+
- name: rhel-9
21+
image: redhat/ubi9:9.1.0
2122
dockerfile: ../common/Dockerfile.j2
2223
privileged: true
24+
cgroupns_mode: host
2325
volumes:
2426
- /sys/fs/cgroup:/sys/fs/cgroup:rw
2527
command: /usr/sbin/init
26-
- name: debian-buster
27-
image: debian:buster-slim
28+
- name: debian-bullseye
29+
image: debian:bullseye-slim
2830
dockerfile: ../common/Dockerfile.j2
2931
privileged: true
32+
cgroupns_mode: host
3033
volumes:
3134
- /sys/fs/cgroup:/sys/fs/cgroup:rw
3235
command: /sbin/init
33-
- name: ubuntu-bionic
34-
image: ubuntu:bionic
36+
- name: ubuntu-jammy
37+
image: ubuntu:jammy
3538
dockerfile: ../common/Dockerfile.j2
3639
privileged: true
40+
cgroupns_mode: host
3741
volumes:
3842
- /sys/fs/cgroup:/sys/fs/cgroup:rw
3943
command: /sbin/init

0 commit comments

Comments
 (0)