Skip to content

Commit f4a30f9

Browse files
xiaoyao9184xiaoyao9184
committed
Fixed Github workflow deprecation Ubuntu 20.04
1 parent c07e8d6 commit f4a30f9

File tree

3 files changed

+113
-109
lines changed

3 files changed

+113
-109
lines changed

‎.github/workflows/test-molecule.yml

Lines changed: 101 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -64,29 +64,29 @@ jobs:
6464
# For other tests, refer to the Tox tests.
6565
include:
6666
- molecule_distro: centos7
67-
runs-on: ubuntu-20.04
68-
cgroup: '@cgroupv1'
67+
runs-on: ubuntu-22.04
68+
cgroup: '@cgroupv2'
6969
python-version: "3.8"
7070
group-python: "py38"
7171
group-ansible: "ansible29"
7272
ansible-config: "./molecule/ansible.old-galaxy.cfg"
7373
- molecule_distro: centos8
74-
runs-on: ubuntu-20.04
75-
cgroup: '@cgroupv1'
74+
runs-on: ubuntu-22.04
75+
cgroup: '@cgroupv2'
7676
python-version: "3.8"
7777
group-python: "py38"
7878
group-ansible: "ansible29"
7979
ansible-config: "./molecule/ansible.old-galaxy.cfg"
8080
- molecule_distro: centos-stream8
81-
runs-on: ubuntu-20.04
82-
cgroup: '@cgroupv1'
81+
runs-on: ubuntu-22.04
82+
cgroup: '@cgroupv2'
8383
python-version: "3.8"
8484
group-python: "py38"
8585
group-ansible: "ansible29"
8686
ansible-config: "./molecule/ansible.old-galaxy.cfg"
8787
- molecule_distro: centos-stream9
88-
runs-on: ubuntu-20.04
89-
cgroup: '@cgroupv1'
88+
runs-on: ubuntu-22.04
89+
cgroup: '@cgroupv2'
9090
python-version: "3.8"
9191
group-python: "py38"
9292
group-ansible: "ansible29"
@@ -98,245 +98,249 @@ jobs:
9898
group-python: "py311"
9999
group-ansible: "ansible216"
100100
- molecule_distro: rockylinux8
101-
runs-on: ubuntu-20.04
102-
cgroup: '@cgroupv1'
101+
runs-on: ubuntu-22.04
102+
cgroup: '@cgroupv2'
103103
python-version: "3.8"
104104
group-python: "py38"
105105
group-ansible: "ansible29"
106106
ansible-config: "./molecule/ansible.old-galaxy.cfg"
107107
- molecule_distro: rockylinux9
108-
runs-on: ubuntu-20.04
109-
cgroup: '@cgroupv1'
108+
runs-on: ubuntu-22.04
109+
cgroup: '@cgroupv2'
110110
python-version: "3.8"
111111
group-python: "py38"
112112
group-ansible: "ansible210"
113113
ansible-config: "./molecule/ansible.old-galaxy.cfg"
114114
- molecule_distro: almalinux8
115-
runs-on: ubuntu-20.04
116-
cgroup: '@cgroupv1'
115+
runs-on: ubuntu-22.04
116+
cgroup: '@cgroupv2'
117117
python-version: "3.8"
118118
group-python: "py38"
119119
group-ansible: "ansible210"
120120
ansible-config: "./molecule/ansible.old-galaxy.cfg"
121121
- molecule_distro: almalinux9
122-
runs-on: ubuntu-20.04
123-
cgroup: '@cgroupv1'
122+
runs-on: ubuntu-22.04
123+
cgroup: '@cgroupv2'
124124
python-version: "3.8"
125125
group-python: "py38"
126126
group-ansible: "ansible210"
127127
ansible-config: "./molecule/ansible.old-galaxy.cfg"
128128
- molecule_distro: debian9
129-
runs-on: ubuntu-20.04
130-
cgroup: '@cgroupv1'
129+
runs-on: ubuntu-22.04
130+
cgroup: '@cgroupv2'
131131
python-version: "3.8"
132132
group-python: "py38"
133133
group-ansible: "ansible29"
134134
ansible-config: "./molecule/ansible.old-galaxy.cfg"
135135
- molecule_distro: debian10
136-
runs-on: ubuntu-20.04
137-
cgroup: '@cgroupv1'
136+
runs-on: ubuntu-22.04
137+
cgroup: '@cgroupv2'
138138
python-version: "3.8"
139139
group-python: "py38"
140140
group-ansible: "ansible29"
141141
ansible-config: "./molecule/ansible.old-galaxy.cfg"
142142
- molecule_distro: debian11
143-
runs-on: ubuntu-20.04
144-
cgroup: '@cgroupv1'
143+
runs-on: ubuntu-22.04
144+
cgroup: '@cgroupv2'
145145
python-version: "3.8"
146146
group-python: "py38"
147147
group-ansible: "ansible29"
148148
ansible-config: "./molecule/ansible.old-galaxy.cfg"
149149
- molecule_distro: debian12
150-
runs-on: ubuntu-20.04
151-
cgroup: '@cgroupv1'
150+
runs-on: ubuntu-22.04
151+
cgroup: '@cgroupv2'
152152
python-version: "3.8"
153153
group-python: "py38"
154154
group-ansible: "ansible29"
155155
ansible-config: "./molecule/ansible.old-galaxy.cfg"
156156
- molecule_distro: debian13
157-
runs-on: ubuntu-20.04
158-
cgroup: '@cgroupv1'
157+
runs-on: ubuntu-22.04
158+
cgroup: '@cgroupv2'
159159
python-version: "3.11"
160160
group-python: "py311"
161161
group-ansible: "ansible218"
162-
- molecule_distro: ubuntu1604
163-
runs-on: ubuntu-20.04
164-
cgroup: '@cgroupv1'
165-
python-version: "3.8"
166-
group-python: "py38"
167-
group-ansible: "ansible29"
168-
ansible-config: "./molecule/ansible.old-galaxy.cfg"
162+
# not supported
163+
# - molecule_distro: ubuntu1604
164+
# runs-on: ubuntu-22.04
165+
# cgroup: '@cgroupv2'
166+
# python-version: "3.8"
167+
# group-python: "py38"
168+
# group-ansible: "ansible29"
169+
# ansible-config: "./molecule/ansible.old-galaxy.cfg"
169170
- molecule_distro: ubuntu1804
170-
runs-on: ubuntu-20.04
171-
cgroup: '@cgroupv1'
171+
runs-on: ubuntu-22.04
172+
cgroup: '@cgroupv2'
172173
python-version: "3.8"
173174
group-python: "py38"
174175
group-ansible: "ansible29"
175176
ansible-config: "./molecule/ansible.old-galaxy.cfg"
176177
- molecule_distro: ubuntu2004
177-
runs-on: ubuntu-20.04
178-
cgroup: '@cgroupv1'
178+
runs-on: ubuntu-22.04
179+
cgroup: '@cgroupv2'
179180
python-version: "3.8"
180181
group-python: "py38"
181182
group-ansible: "ansible29"
182183
ansible-config: "./molecule/ansible.old-galaxy.cfg"
183184
- molecule_distro: ubuntu2204
184-
runs-on: ubuntu-20.04
185-
cgroup: '@cgroupv1'
185+
runs-on: ubuntu-22.04
186+
cgroup: '@cgroupv2'
186187
python-version: "3.8"
187188
group-python: "py38"
188189
group-ansible: "ansible29"
189190
ansible-config: "./molecule/ansible.old-galaxy.cfg"
190191
- molecule_distro: ubuntu2404
191-
runs-on: ubuntu-20.04
192-
cgroup: '@cgroupv1'
192+
runs-on: ubuntu-22.04
193+
cgroup: '@cgroupv2'
193194
python-version: "3.11"
194195
group-python: "py311"
195196
group-ansible: "ansible216"
196197
- molecule_distro: opensuseleap15
197-
runs-on: ubuntu-20.04
198-
cgroup: '@cgroupv1'
199-
python-version: "3.8"
200-
group-python: "py38"
201-
group-ansible: "ansible29"
202-
ansible-config: "./molecule/ansible.old-galaxy.cfg"
203-
- molecule_distro: amazonlinux2
204-
runs-on: ubuntu-20.04
205-
cgroup: '@cgroupv1'
198+
runs-on: ubuntu-22.04
199+
cgroup: '@cgroupv2'
206200
python-version: "3.8"
207201
group-python: "py38"
208202
group-ansible: "ansible29"
209203
ansible-config: "./molecule/ansible.old-galaxy.cfg"
204+
# not supported
205+
# - molecule_distro: amazonlinux2
206+
# runs-on: ubuntu-22.04
207+
# cgroup: '@cgroupv2'
208+
# python-version: "3.8"
209+
# group-python: "py38"
210+
# group-ansible: "ansible29"
211+
# ansible-config: "./molecule/ansible.old-galaxy.cfg"
210212
- molecule_distro: amazonlinux2023
211-
runs-on: ubuntu-20.04
212-
cgroup: '@cgroupv1'
213+
runs-on: ubuntu-22.04
214+
cgroup: '@cgroupv2'
213215
python-version: "3.8"
214216
group-python: "py38"
215217
group-ansible: "ansible210"
216218
ansible-config: "./molecule/ansible.old-galaxy.cfg"
217219
- molecule_distro: alpine317
218-
runs-on: ubuntu-20.04
219-
cgroup: '@cgroupv1'
220+
runs-on: ubuntu-22.04
221+
cgroup: '@cgroupv2'
220222
python-version: "3.8"
221223
group-python: "py38"
222224
group-ansible: "ansible212"
223225
- molecule_distro: alpine318
224-
runs-on: ubuntu-20.04
225-
cgroup: '@cgroupv1'
226+
runs-on: ubuntu-22.04
227+
cgroup: '@cgroupv2'
226228
python-version: "3.11"
227229
group-python: "py311"
228230
group-ansible: "ansible214"
229231
- molecule_distro: alpine319
230-
runs-on: ubuntu-20.04
231-
cgroup: '@cgroupv1'
232+
runs-on: ubuntu-22.04
233+
cgroup: '@cgroupv2'
232234
python-version: "3.11"
233235
group-python: "py311"
234236
group-ansible: "ansible214"
235237
- molecule_distro: alpine320
236-
runs-on: ubuntu-20.04
238+
runs-on: ubuntu-22.04
237239
cgroup: '@cgroupv2'
238240
python-version: "3.11"
239241
group-python: "py311"
240242
group-ansible: "ansible216"
241243
- molecule_distro: alpine321
242-
runs-on: ubuntu-20.04
244+
runs-on: ubuntu-22.04
243245
cgroup: '@cgroupv2'
244246
python-version: "3.11"
245247
group-python: "py311"
246248
group-ansible: "ansible216"
247-
- molecule_distro: fedora24
248-
runs-on: ubuntu-20.04
249-
cgroup: '@cgroupv1'
250-
python-version: "3.8"
251-
group-python: "py38"
252-
group-ansible: "ansible29"
253-
ansible-config: "./molecule/ansible.old-galaxy.cfg"
254-
- molecule_distro: fedora27
255-
runs-on: ubuntu-20.04
256-
cgroup: '@cgroupv1'
257-
python-version: "3.8"
258-
group-python: "py38"
259-
group-ansible: "ansible29"
260-
ansible-config: "./molecule/ansible.old-galaxy.cfg"
249+
# not supported
250+
# - molecule_distro: fedora24
251+
# runs-on: ubuntu-22.04
252+
# cgroup: '@cgroupv2'
253+
# python-version: "3.8"
254+
# group-python: "py38"
255+
# group-ansible: "ansible29"
256+
# ansible-config: "./molecule/ansible.old-galaxy.cfg"
257+
# not supported
258+
# - molecule_distro: fedora27
259+
# runs-on: ubuntu-22.04
260+
# cgroup: '@cgroupv2'
261+
# python-version: "3.8"
262+
# group-python: "py38"
263+
# group-ansible: "ansible29"
264+
# ansible-config: "./molecule/ansible.old-galaxy.cfg"
261265
- molecule_distro: fedora29
262-
runs-on: ubuntu-20.04
263-
cgroup: '@cgroupv1'
266+
runs-on: ubuntu-22.04
267+
cgroup: '@cgroupv2'
264268
python-version: "3.8"
265269
group-python: "py38"
266270
group-ansible: "ansible29"
267271
- molecule_distro: fedora30
268-
runs-on: ubuntu-20.04
269-
cgroup: '@cgroupv1'
272+
runs-on: ubuntu-22.04
273+
cgroup: '@cgroupv2'
270274
python-version: "3.8"
271275
group-python: "py38"
272276
group-ansible: "ansible29"
273277
ansible-config: "./molecule/ansible.old-galaxy.cfg"
274278
- molecule_distro: fedora31
275-
runs-on: ubuntu-20.04
276-
cgroup: '@cgroupv1'
279+
runs-on: ubuntu-22.04
280+
cgroup: '@cgroupv2'
277281
python-version: "3.8"
278282
group-python: "py38"
279283
group-ansible: "ansible29"
280284
ansible-config: "./molecule/ansible.old-galaxy.cfg"
281285
- molecule_distro: fedora32
282-
runs-on: ubuntu-20.04
283-
cgroup: '@cgroupv1'
286+
runs-on: ubuntu-22.04
287+
cgroup: '@cgroupv2'
284288
python-version: "3.8"
285289
group-python: "py38"
286290
group-ansible: "ansible29"
287291
ansible-config: "./molecule/ansible.old-galaxy.cfg"
288292
- molecule_distro: fedora33
289-
runs-on: ubuntu-20.04
290-
cgroup: '@cgroupv1'
293+
runs-on: ubuntu-22.04
294+
cgroup: '@cgroupv2'
291295
python-version: "3.8"
292296
group-python: "py38"
293297
group-ansible: "ansible210"
294298
ansible-config: "./molecule/ansible.old-galaxy.cfg"
295299
- molecule_distro: fedora34
296-
runs-on: ubuntu-20.04
297-
cgroup: '@cgroupv1'
300+
runs-on: ubuntu-22.04
301+
cgroup: '@cgroupv2'
298302
python-version: "3.8"
299303
group-python: "py38"
300304
group-ansible: "ansible210"
301305
ansible-config: "./molecule/ansible.old-galaxy.cfg"
302306
- molecule_distro: fedora35
303-
runs-on: ubuntu-20.04
304-
cgroup: '@cgroupv1'
307+
runs-on: ubuntu-22.04
308+
cgroup: '@cgroupv2'
305309
python-version: "3.8"
306310
group-python: "py38"
307311
group-ansible: "ansible212"
308312
- molecule_distro: fedora36
309-
runs-on: ubuntu-20.04
310-
cgroup: '@cgroupv1'
313+
runs-on: ubuntu-22.04
314+
cgroup: '@cgroupv2'
311315
python-version: "3.8"
312316
group-python: "py38"
313317
group-ansible: "ansible212"
314318
- molecule_distro: fedora37
315-
runs-on: ubuntu-20.04
316-
cgroup: '@cgroupv1'
319+
runs-on: ubuntu-22.04
320+
cgroup: '@cgroupv2'
317321
python-version: "3.11"
318322
group-python: "py311"
319323
group-ansible: "ansible214"
320324
- molecule_distro: fedora38
321-
runs-on: ubuntu-20.04
322-
cgroup: '@cgroupv1'
325+
runs-on: ubuntu-22.04
326+
cgroup: '@cgroupv2'
323327
python-version: "3.11"
324328
group-python: "py311"
325329
group-ansible: "ansible214"
326330
- molecule_distro: fedora39
327-
runs-on: ubuntu-20.04
331+
runs-on: ubuntu-22.04
328332
cgroup: '@cgroupv2'
329333
python-version: "3.11"
330334
group-python: "py311"
331335
group-ansible: "ansible216"
332336
- molecule_distro: fedora40
333-
runs-on: ubuntu-20.04
337+
runs-on: ubuntu-22.04
334338
cgroup: '@cgroupv2'
335339
python-version: "3.11"
336340
group-python: "py311"
337341
group-ansible: "ansible216"
338342
- molecule_distro: fedora41
339-
runs-on: ubuntu-20.04
343+
runs-on: ubuntu-22.04
340344
cgroup: '@cgroupv2'
341345
python-version: "3.11"
342346
group-python: "py311"

‎tox-ansible.ini

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ skip.ansible.2.18.cgroupv1 = true
7979
skip.ansible.2.17.cgroupv1 = true
8080
skip.ansible.2.16.cgroupv1 = true
8181
skip.ansible.2.15.cgroupv1 = true
82-
skip.ansible.2.14.cgroupv2 = true
83-
skip.ansible.2.13.cgroupv2 = true
84-
skip.ansible.2.12.cgroupv2 = true
85-
skip.ansible.2.11.cgroupv2 = true
86-
skip.ansible.2.10.cgroupv2 = true
87-
skip.ansible.2.9.cgroupv2 = true
82+
skip.ansible.2.14.cgroupv1 = true
83+
skip.ansible.2.13.cgroupv1 = true
84+
skip.ansible.2.12.cgroupv1 = true
85+
skip.ansible.2.11.cgroupv1 = true
86+
skip.ansible.2.10.cgroupv1 = true
87+
skip.ansible.2.9.cgroupv1 = true

0 commit comments

Comments
 (0)