Skip to content

Commit cad2ecc

Browse files
authored
Move ansible-core 2.12 to EOL CI (ansible-collections#640)
* ansible/ansible#79734 has been merged and backported for all branches but stable-2.10 and stable-2.11. * Move ansible-core 2.12 to EOL CI.
1 parent 748d619 commit cad2ecc

File tree

2 files changed

+30
-50
lines changed

2 files changed

+30
-50
lines changed

.azure-pipelines/azure-pipelines.yml

-47
Original file line numberDiff line numberDiff line change
@@ -99,17 +99,6 @@ stages:
9999
test: '2.13/sanity/1'
100100
- name: Units
101101
test: '2.13/units/1'
102-
- stage: Ansible_2_12
103-
displayName: Sanity & Units 2.12
104-
dependsOn: []
105-
jobs:
106-
- template: templates/matrix.yml
107-
parameters:
108-
targets:
109-
- name: Sanity
110-
test: '2.12/sanity/1'
111-
- name: Units
112-
test: '2.12/units/1'
113102

114103
### Docker
115104
- stage: Docker_devel
@@ -178,23 +167,6 @@ stages:
178167
groups:
179168
- 4
180169
- 5
181-
- stage: Docker_2_12
182-
displayName: Docker 2.12
183-
dependsOn: []
184-
jobs:
185-
- template: templates/matrix.yml
186-
parameters:
187-
testFormat: 2.12/linux/{0}
188-
targets:
189-
- name: Fedora 33
190-
test: fedora33
191-
- name: Fedora 34
192-
test: fedora34
193-
- name: Ubuntu 18.04
194-
test: ubuntu1804
195-
groups:
196-
- 4
197-
- 5
198170

199171
### Community Docker
200172
- stage: Docker_community_devel
@@ -282,22 +254,6 @@ stages:
282254
- 3
283255
- 4
284256
- 5
285-
- stage: Remote_2_12
286-
displayName: Remote 2.12
287-
dependsOn: []
288-
jobs:
289-
- template: templates/matrix.yml
290-
parameters:
291-
testFormat: 2.12/{0}
292-
targets:
293-
- name: RHEL 8.4
294-
test: rhel/8.4
295-
groups:
296-
- 1
297-
- 2
298-
- 3
299-
- 4
300-
- 5
301257

302258
## Finally
303259

@@ -308,17 +264,14 @@ stages:
308264
- Ansible_2_15
309265
- Ansible_2_14
310266
- Ansible_2_13
311-
- Ansible_2_12
312267
- Remote_devel
313268
- Remote_2_15
314269
- Remote_2_14
315270
- Remote_2_13
316-
- Remote_2_12
317271
- Docker_devel
318272
- Docker_2_15
319273
- Docker_2_14
320274
- Docker_2_13
321-
- Docker_2_12
322275
- Docker_community_devel
323276
jobs:
324277
- template: templates/coverage.yml

.github/workflows/ansible-test.yml

+30-3
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ jobs:
3030
matrix:
3131
ansible:
3232
- '2.11'
33+
- '2.12'
3334
# Ansible-test on various stable branches does not yet work well with cgroups v2.
3435
# Since ubuntu-latest now uses Ubuntu 22.04, we need to fall back to the ubuntu-20.04
3536
# image for these stable branches. The list of branches where this is necessary will
@@ -43,7 +44,7 @@ jobs:
4344
- name: Perform sanity testing
4445
uses: felixfontein/ansible-test-gh-action@main
4546
with:
46-
ansible-core-github-repository-slug: felixfontein/ansible
47+
ansible-core-github-repository-slug: ${{ contains(fromJson('["2.10", "2.11"]'), matrix.ansible) && 'felixfontein/ansible' || 'ansible/ansible' }}
4748
ansible-core-version: stable-${{ matrix.ansible }}
4849
coverage: ${{ github.event_name == 'schedule' && 'always' || 'never' }}
4950
pull-request-change-detection: 'true'
@@ -66,14 +67,15 @@ jobs:
6667
matrix:
6768
ansible:
6869
- '2.11'
70+
- '2.12'
6971

7072
steps:
7173
- name: >-
7274
Perform unit testing against
7375
Ansible version ${{ matrix.ansible }}
7476
uses: felixfontein/ansible-test-gh-action@main
7577
with:
76-
ansible-core-github-repository-slug: felixfontein/ansible
78+
ansible-core-github-repository-slug: ${{ contains(fromJson('["2.10", "2.11"]'), matrix.ansible) && 'felixfontein/ansible' || 'ansible/ansible' }}
7779
ansible-core-version: stable-${{ matrix.ansible }}
7880
coverage: ${{ github.event_name == 'schedule' && 'always' || 'never' }}
7981
pull-request-change-detection: 'true'
@@ -126,6 +128,31 @@ jobs:
126128
docker: alpine3
127129
python: ''
128130
target: azp/5/
131+
# 2.12
132+
- ansible: '2.12'
133+
docker: fedora33
134+
python: ''
135+
target: azp/4/
136+
- ansible: '2.12'
137+
docker: fedora33
138+
python: ''
139+
target: azp/5/
140+
- ansible: '2.12'
141+
docker: fedora34
142+
python: ''
143+
target: azp/4/
144+
- ansible: '2.12'
145+
docker: fedora34
146+
python: ''
147+
target: azp/5/
148+
- ansible: '2.12'
149+
docker: ubuntu1804
150+
python: ''
151+
target: azp/4/
152+
- ansible: '2.12'
153+
docker: ubuntu1804
154+
python: ''
155+
target: azp/5/
129156

130157
steps:
131158
- name: >-
@@ -134,7 +161,7 @@ jobs:
134161
under Python ${{ matrix.python }}
135162
uses: felixfontein/ansible-test-gh-action@main
136163
with:
137-
ansible-core-github-repository-slug: felixfontein/ansible
164+
ansible-core-github-repository-slug: ${{ contains(fromJson('["2.10", "2.11"]'), matrix.ansible) && 'felixfontein/ansible' || 'ansible/ansible' }}
138165
ansible-core-version: stable-${{ matrix.ansible }}
139166
coverage: ${{ github.event_name == 'schedule' && 'always' || 'never' }}
140167
docker-image: ${{ matrix.docker }}

0 commit comments

Comments
 (0)