Skip to content

Commit d81044d

Browse files
authoredNov 12, 2024
Update core and ubuntu (#85)
* remove 2.15 as it is EOL now * remove ubuntu variants - no longer needed
1 parent a1bbe85 commit d81044d

File tree

2 files changed

+8
-47
lines changed

2 files changed

+8
-47
lines changed
 

‎.github/workflows/ansible-test.yml

+7-46
Original file line numberDiff line numberDiff line change
@@ -76,21 +76,14 @@ jobs:
7676
# Add new versions announced in
7777
# https://github.com/ansible-collections/news-for-maintainers in a timely manner,
7878
# consider dropping testing against EOL versions and versions you don't support.
79-
- stable-2.15
8079
- stable-2.16
8180
- stable-2.17
8281
- stable-2.18
8382
- devel
8483
# - milestone
85-
# Ansible-test on various stable branches does not yet work well with cgroups v2.
86-
# Since ubuntu-latest now uses Ubuntu 22.04, we need to fall back to the ubuntu-20.04
87-
# image for these stable branches. The list of branches where this is necessary will
88-
# shrink over time, check out https://github.com/ansible-collections/news-for-maintainers/issues/28
89-
# for the latest list.
90-
runs-on: >-
91-
${{ contains(fromJson(
92-
'["stable-2.9", "stable-2.10", "stable-2.11"]'
93-
), matrix.ansible) && 'ubuntu-20.04' || 'ubuntu-latest' }}
84+
85+
runs-on: ubuntu-latest
86+
9487
steps:
9588
# Run sanity tests inside a Docker container.
9689
# The docker container has all the pinned dependencies that are
@@ -118,15 +111,8 @@ jobs:
118111
# https://docs.ansible.com/ansible/latest/dev_guide/testing_units.html
119112

120113
units:
121-
# Ansible-test on various stable branches does not yet work well with cgroups v2.
122-
# Since ubuntu-latest now uses Ubuntu 22.04, we need to fall back to the ubuntu-20.04
123-
# image for these stable branches. The list of branches where this is necessary will
124-
# shrink over time, check out https://github.com/ansible-collections/news-for-maintainers/issues/28
125-
# for the latest list.
126-
runs-on: >-
127-
${{ contains(fromJson(
128-
'["stable-2.9", "stable-2.10", "stable-2.11"]'
129-
), matrix.ansible) && 'ubuntu-20.04' || 'ubuntu-latest' }}
114+
runs-on: ubuntu-latest
115+
130116
name: Units (Ⓐ${{ matrix.ansible }})
131117
strategy:
132118
# As soon as the first unit test fails, cancel the others to free up the CI queue
@@ -136,7 +122,6 @@ jobs:
136122
# Add new versions announced in
137123
# https://github.com/ansible-collections/news-for-maintainers in a timely manner,
138124
# consider dropping testing against EOL versions and versions you don't support.
139-
- stable-2.15
140125
- stable-2.16
141126
- stable-2.17
142127
- stable-2.18
@@ -174,15 +159,8 @@ jobs:
174159
# https://github.com/ansible-collections/community.zabbix/tree/master/.github/workflows
175160

176161
integration:
177-
# Ansible-test on various stable branches does not yet work well with cgroups v2.
178-
# Since ubuntu-latest now uses Ubuntu 22.04, we need to fall back to the ubuntu-20.04
179-
# image for these stable branches. The list of branches where this is necessary will
180-
# shrink over time, check out https://github.com/ansible-collections/news-for-maintainers/issues/28
181-
# for the latest list.
182-
runs-on: >-
183-
${{ contains(fromJson(
184-
'["stable-2.9", "stable-2.10", "stable-2.11"]'
185-
), matrix.ansible) && 'ubuntu-20.04' || 'ubuntu-latest' }}
162+
runs-on: ubuntu-latest
163+
186164
name: I (Ⓐ${{ matrix.ansible }}+py${{ matrix.python }})
187165
strategy:
188166
fail-fast: false
@@ -201,23 +179,6 @@ jobs:
201179
# Add new versions announced in
202180
# https://github.com/ansible-collections/news-for-maintainers in a timely manner,
203181
# consider dropping testing against EOL versions and versions you don't support.
204-
# ansible-core 2.15
205-
- ansible: stable-2.15
206-
python: '2.7'
207-
- ansible: stable-2.15
208-
python: '3.5'
209-
- ansible: stable-2.15
210-
python: '3.6'
211-
- ansible: stable-2.15
212-
python: '3.7'
213-
- ansible: stable-2.15
214-
python: '3.8'
215-
- ansible: stable-2.15
216-
python: '3.9'
217-
- ansible: stable-2.15
218-
python: '3.10'
219-
- ansible: stable-2.15
220-
python: '3.11'
221182
# ansible-core 2.16
222183
- ansible: stable-2.16
223184
python: '2.7'

‎meta/runtime.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
requires_ansible: '>=2.11.0' # Use '>=2.9.10' instead, if needed
2+
requires_ansible: '>=2.16.0' # Use '>=2.9.10' instead, if needed

0 commit comments

Comments
 (0)
Please sign in to comment.