Skip to content

Commit 2d3c527

Browse files
authored
Update GitHub actions to use Ubuntu 22.04 (#539)
1 parent 3affba0 commit 2d3c527

File tree

15 files changed

+222
-3
lines changed

15 files changed

+222
-3
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
strategy:
2020
fail-fast: false
2121
matrix:

.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
@@ -11,6 +11,10 @@ BUG FIXES:
1111

1212
* Fix an issue when installing the GeoIP2 module on an UBI 7 container where the the `libmaxminddb` package dependency might not be available via `yum` (if it's not available, `libmaxminddb` is installed from an external source).
1313

14+
TESTS:
15+
16+
* Update GitHub actions to run on Ubuntu 22.04. Amazon Linux 2 does not support cgroups v2 so the corresponding Molecule tests have been removed.
17+
1418
## 0.23.2 (September 28, 2022)
1519

1620
FEATURES:

molecule/common/Dockerfile.j2

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ 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 \

molecule/default/molecule.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,146 +9,167 @@ platforms:
99
image: almalinux:8
1010
dockerfile: ../common/Dockerfile.j2
1111
privileged: true
12+
cgroupns_mode: host
1213
volumes:
1314
- /sys/fs/cgroup:/sys/fs/cgroup:rw
1415
command: /usr/sbin/init
1516
- name: almalinux-9
1617
image: almalinux:9
1718
dockerfile: ../common/Dockerfile.j2
1819
privileged: true
20+
cgroupns_mode: host
1921
volumes:
2022
- /sys/fs/cgroup:/sys/fs/cgroup:rw
2123
command: /usr/sbin/init
2224
- name: alpine-3.14
2325
image: alpine:3.14
2426
dockerfile: ../common/Dockerfile.j2
2527
privileged: true
28+
cgroupns_mode: host
2629
volumes:
2730
- /sys/fs/cgroup:/sys/fs/cgroup:rw
2831
command: /sbin/init
2932
- name: alpine-3.15
3033
image: alpine:3.15
3134
dockerfile: ../common/Dockerfile.j2
3235
privileged: true
36+
cgroupns_mode: host
3337
volumes:
3438
- /sys/fs/cgroup:/sys/fs/cgroup:rw
3539
command: /sbin/init
3640
- name: alpine-3.16
3741
image: alpine:3.16
3842
dockerfile: ../common/Dockerfile.j2
3943
privileged: true
44+
cgroupns_mode: host
4045
volumes:
4146
- /sys/fs/cgroup:/sys/fs/cgroup:rw
4247
command: /sbin/init
4348
- name: alpine-3.17
4449
image: alpine:3.17
4550
dockerfile: ../common/Dockerfile.j2
4651
privileged: true
52+
cgroupns_mode: host
4753
volumes:
4854
- /sys/fs/cgroup:/sys/fs/cgroup:rw
4955
command: /sbin/init
5056
- name: amazonlinux-2
5157
image: amazonlinux:2
5258
dockerfile: ../common/Dockerfile.j2
5359
privileged: true
60+
cgroupns_mode: host
5461
volumes:
5562
- /sys/fs/cgroup:/sys/fs/cgroup:rw
5663
command: /usr/sbin/init
5764
- name: centos-7
5865
image: centos:7
5966
dockerfile: ../common/Dockerfile.j2
6067
privileged: true
68+
cgroupns_mode: host
6169
volumes:
6270
- /sys/fs/cgroup:/sys/fs/cgroup:rw
6371
command: /usr/sbin/init
6472
- name: debian-bullseye
6573
image: debian:bullseye-slim
6674
dockerfile: ../common/Dockerfile.j2
6775
privileged: true
76+
cgroupns_mode: host
6877
volumes:
6978
- /sys/fs/cgroup:/sys/fs/cgroup:rw
7079
command: /sbin/init
7180
- name: oraclelinux-7
7281
image: oraclelinux:7
7382
dockerfile: ../common/Dockerfile.j2
7483
privileged: true
84+
cgroupns_mode: host
7585
volumes:
7686
- /sys/fs/cgroup:/sys/fs/cgroup:rw
7787
command: /usr/sbin/init
7888
- name: oraclelinux-8
7989
image: oraclelinux:8
8090
dockerfile: ../common/Dockerfile.j2
8191
privileged: true
92+
cgroupns_mode: host
8293
volumes:
8394
- /sys/fs/cgroup:/sys/fs/cgroup:rw
8495
command: /usr/sbin/init
8596
- name: oraclelinux-9
8697
image: oraclelinux:9
8798
dockerfile: ../common/Dockerfile.j2
8899
privileged: true
100+
cgroupns_mode: host
89101
volumes:
90102
- /sys/fs/cgroup:/sys/fs/cgroup:rw
91103
command: /usr/sbin/init
92104
- name: rhel-7
93105
image: registry.access.redhat.com/ubi7/ubi:7.9
94106
dockerfile: ../common/Dockerfile.j2
95107
privileged: true
108+
cgroupns_mode: host
96109
volumes:
97110
- /sys/fs/cgroup:/sys/fs/cgroup:rw
98111
command: /usr/sbin/init
99112
- name: rhel-8
100113
image: redhat/ubi8:8.7
101114
dockerfile: ../common/Dockerfile.j2
102115
privileged: true
116+
cgroupns_mode: host
103117
volumes:
104118
- /sys/fs/cgroup:/sys/fs/cgroup:rw
105119
command: /usr/sbin/init
106120
- name: rhel-9
107121
image: redhat/ubi9:9.1.0
108122
dockerfile: ../common/Dockerfile.j2
109123
privileged: true
124+
cgroupns_mode: host
110125
volumes:
111126
- /sys/fs/cgroup:/sys/fs/cgroup:rw
112127
command: /usr/sbin/init
113128
- name: rockylinux-8
114129
image: rockylinux:8
115130
dockerfile: ../common/Dockerfile.j2
116131
privileged: true
132+
cgroupns_mode: host
117133
volumes:
118134
- /sys/fs/cgroup:/sys/fs/cgroup:rw
119135
command: /usr/sbin/init
120136
- name: rockylinux-9
121137
image: rockylinux:9.0.20220720
122138
dockerfile: ../common/Dockerfile.j2
123139
privileged: true
140+
cgroupns_mode: host
124141
volumes:
125142
- /sys/fs/cgroup:/sys/fs/cgroup:rw
126143
command: /usr/sbin/init
127144
- name: sles15
128145
image: registry.suse.com/bci/bci-base:15.4
129146
dockerfile: ../common/Dockerfile.j2
130147
privileged: true
148+
cgroupns_mode: host
131149
volumes:
132150
- /sys/fs/cgroup:/sys/fs/cgroup:rw
133151
command: /usr/sbin/init
134152
- name: ubuntu-bionic
135153
image: ubuntu:bionic
136154
dockerfile: ../common/Dockerfile.j2
137155
privileged: true
156+
cgroupns_mode: host
138157
volumes:
139158
- /sys/fs/cgroup:/sys/fs/cgroup:rw
140159
command: /sbin/init
141160
- name: ubuntu-focal
142161
image: ubuntu:focal
143162
dockerfile: ../common/Dockerfile.j2
144163
privileged: true
164+
cgroupns_mode: host
145165
volumes:
146166
- /sys/fs/cgroup:/sys/fs/cgroup:rw
147167
command: /sbin/init
148168
- name: ubuntu-jammy
149169
image: ubuntu:jammy
150170
dockerfile: ../common/Dockerfile.j2
151171
privileged: true
172+
cgroupns_mode: host
152173
volumes:
153174
- /sys/fs/cgroup:/sys/fs/cgroup:rw
154175
command: /sbin/init

molecule/downgrade/molecule.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,146 +9,167 @@ platforms:
99
image: almalinux:8
1010
dockerfile: ../common/Dockerfile.j2
1111
privileged: true
12+
cgroupns_mode: host
1213
volumes:
1314
- /sys/fs/cgroup:/sys/fs/cgroup:rw
1415
command: /usr/sbin/init
1516
- name: almalinux-9
1617
image: almalinux:9
1718
dockerfile: ../common/Dockerfile.j2
1819
privileged: true
20+
cgroupns_mode: host
1921
volumes:
2022
- /sys/fs/cgroup:/sys/fs/cgroup:rw
2123
command: /usr/sbin/init
2224
- name: alpine-3.14
2325
image: alpine:3.14
2426
dockerfile: ../common/Dockerfile.j2
2527
privileged: true
28+
cgroupns_mode: host
2629
volumes:
2730
- /sys/fs/cgroup:/sys/fs/cgroup:rw
2831
command: /sbin/init
2932
- name: alpine-3.15
3033
image: alpine:3.15
3134
dockerfile: ../common/Dockerfile.j2
3235
privileged: true
36+
cgroupns_mode: host
3337
volumes:
3438
- /sys/fs/cgroup:/sys/fs/cgroup:rw
3539
command: /sbin/init
3640
- name: alpine-3.16
3741
image: alpine:3.16
3842
dockerfile: ../common/Dockerfile.j2
3943
privileged: true
44+
cgroupns_mode: host
4045
volumes:
4146
- /sys/fs/cgroup:/sys/fs/cgroup:rw
4247
command: /sbin/init
4348
- name: alpine-3.17
4449
image: alpine:3.17
4550
dockerfile: ../common/Dockerfile.j2
4651
privileged: true
52+
cgroupns_mode: host
4753
volumes:
4854
- /sys/fs/cgroup:/sys/fs/cgroup:rw
4955
command: /sbin/init
5056
- name: amazonlinux-2
5157
image: amazonlinux:2
5258
dockerfile: ../common/Dockerfile.j2
5359
privileged: true
60+
cgroupns_mode: host
5461
volumes:
5562
- /sys/fs/cgroup:/sys/fs/cgroup:rw
5663
command: /usr/sbin/init
5764
- name: centos-7
5865
image: centos:7
5966
dockerfile: ../common/Dockerfile.j2
6067
privileged: true
68+
cgroupns_mode: host
6169
volumes:
6270
- /sys/fs/cgroup:/sys/fs/cgroup:rw
6371
command: /usr/sbin/init
6472
- name: debian-bullseye
6573
image: debian:bullseye-slim
6674
dockerfile: ../common/Dockerfile.j2
6775
privileged: true
76+
cgroupns_mode: host
6877
volumes:
6978
- /sys/fs/cgroup:/sys/fs/cgroup:rw
7079
command: /sbin/init
7180
- name: oraclelinux-7
7281
image: oraclelinux:7
7382
dockerfile: ../common/Dockerfile.j2
7483
privileged: true
84+
cgroupns_mode: host
7585
volumes:
7686
- /sys/fs/cgroup:/sys/fs/cgroup:rw
7787
command: /usr/sbin/init
7888
- name: oraclelinux-8
7989
image: oraclelinux:8
8090
dockerfile: ../common/Dockerfile.j2
8191
privileged: true
92+
cgroupns_mode: host
8293
volumes:
8394
- /sys/fs/cgroup:/sys/fs/cgroup:rw
8495
command: /usr/sbin/init
8596
- name: oraclelinux-9
8697
image: oraclelinux:9
8798
dockerfile: ../common/Dockerfile.j2
8899
privileged: true
100+
cgroupns_mode: host
89101
volumes:
90102
- /sys/fs/cgroup:/sys/fs/cgroup:rw
91103
command: /usr/sbin/init
92104
- name: rhel-7
93105
image: registry.access.redhat.com/ubi7/ubi:7.9
94106
dockerfile: ../common/Dockerfile.j2
95107
privileged: true
108+
cgroupns_mode: host
96109
volumes:
97110
- /sys/fs/cgroup:/sys/fs/cgroup:rw
98111
command: /usr/sbin/init
99112
- name: rhel-8
100113
image: redhat/ubi8:8.7
101114
dockerfile: ../common/Dockerfile.j2
102115
privileged: true
116+
cgroupns_mode: host
103117
volumes:
104118
- /sys/fs/cgroup:/sys/fs/cgroup:rw
105119
command: /usr/sbin/init
106120
- name: rhel-9
107121
image: redhat/ubi9:9.1.0
108122
dockerfile: ../common/Dockerfile.j2
109123
privileged: true
124+
cgroupns_mode: host
110125
volumes:
111126
- /sys/fs/cgroup:/sys/fs/cgroup:rw
112127
command: /usr/sbin/init
113128
- name: rockylinux-8
114129
image: rockylinux:8
115130
dockerfile: ../common/Dockerfile.j2
116131
privileged: true
132+
cgroupns_mode: host
117133
volumes:
118134
- /sys/fs/cgroup:/sys/fs/cgroup:rw
119135
command: /usr/sbin/init
120136
- name: rockylinux-9
121137
image: rockylinux:9.0.20220720
122138
dockerfile: ../common/Dockerfile.j2
123139
privileged: true
140+
cgroupns_mode: host
124141
volumes:
125142
- /sys/fs/cgroup:/sys/fs/cgroup:rw
126143
command: /usr/sbin/init
127144
- name: sles15
128145
image: registry.suse.com/bci/bci-base:15.4
129146
dockerfile: ../common/Dockerfile.j2
130147
privileged: true
148+
cgroupns_mode: host
131149
volumes:
132150
- /sys/fs/cgroup:/sys/fs/cgroup:rw
133151
command: /usr/sbin/init
134152
- name: ubuntu-bionic
135153
image: ubuntu:bionic
136154
dockerfile: ../common/Dockerfile.j2
137155
privileged: true
156+
cgroupns_mode: host
138157
volumes:
139158
- /sys/fs/cgroup:/sys/fs/cgroup:rw
140159
command: /sbin/init
141160
- name: ubuntu-focal
142161
image: ubuntu:focal
143162
dockerfile: ../common/Dockerfile.j2
144163
privileged: true
164+
cgroupns_mode: host
145165
volumes:
146166
- /sys/fs/cgroup:/sys/fs/cgroup:rw
147167
command: /sbin/init
148168
- name: ubuntu-jammy
149169
image: ubuntu:jammy
150170
dockerfile: ../common/Dockerfile.j2
151171
privileged: true
172+
cgroupns_mode: host
152173
volumes:
153174
- /sys/fs/cgroup:/sys/fs/cgroup:rw
154175
command: /sbin/init

0 commit comments

Comments
 (0)