Skip to content

Commit

Permalink
Add ansible-core 2.16 to the matrix. (#686)
Browse files Browse the repository at this point in the history
  • Loading branch information
felixfontein authored Sep 19, 2023
1 parent 128117b commit d9f49fc
Show file tree
Hide file tree
Showing 5 changed files with 77 additions and 50 deletions.
94 changes: 45 additions & 49 deletions .azure-pipelines/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,17 @@ stages:
test: 'devel/sanity/extra'
- name: Units
test: 'devel/units/1'
- stage: Ansible_2_16
displayName: Sanity & Units 2.16
dependsOn: []
jobs:
- template: templates/matrix.yml
parameters:
targets:
- name: Sanity
test: '2.16/sanity/1'
- name: Units
test: '2.16/units/1'
- stage: Ansible_2_15
displayName: Sanity & Units 2.15
dependsOn: []
Expand All @@ -88,17 +99,6 @@ stages:
test: '2.14/sanity/1'
- name: Units
test: '2.14/units/1'
- stage: Ansible_2_13
displayName: Sanity & Units 2.13
dependsOn: []
jobs:
- template: templates/matrix.yml
parameters:
targets:
- name: Sanity
test: '2.13/sanity/1'
- name: Units
test: '2.13/units/1'

### Docker
- stage: Docker_devel
Expand All @@ -111,8 +111,8 @@ stages:
targets:
- name: CentOS 7
test: centos7
- name: Fedora 38
test: fedora38
#- name: Fedora 38
# test: fedora38
- name: openSUSE 15
test: opensuse15
- name: Ubuntu 20.04
Expand All @@ -124,6 +124,19 @@ stages:
groups:
- 4
- 5
- stage: Docker_2_16
displayName: Docker 2.16
dependsOn: []
jobs:
- template: templates/matrix.yml
parameters:
testFormat: 2.16/linux/{0}
targets:
- name: Fedora 38
test: fedora38
groups:
- 4
- 5
- stage: Docker_2_15
displayName: Docker 2.15
dependsOn: []
Expand Down Expand Up @@ -152,23 +165,6 @@ stages:
groups:
- 4
- 5
- stage: Docker_2_13
displayName: Docker 2.13
dependsOn: []
jobs:
- template: templates/matrix.yml
parameters:
testFormat: 2.13/linux/{0}
targets:
- name: Fedora 35
test: fedora35
- name: openSUSE 15 py2
test: opensuse15py2
- name: Alpine 3
test: alpine3
groups:
- 4
- 5

### Community Docker
- stage: Docker_community_devel
Expand Down Expand Up @@ -213,6 +209,22 @@ stages:
- 3
- 4
- 5
- stage: Remote_2_16
displayName: Remote 2.16
dependsOn: []
jobs:
- template: templates/matrix.yml
parameters:
testFormat: 2.16/{0}
targets:
- name: RHEL 9.2
test: rhel/9.2
groups:
- 1
- 2
- 3
- 4
- 5
- stage: Remote_2_15
displayName: Remote 2.15
dependsOn: []
Expand Down Expand Up @@ -249,40 +261,24 @@ stages:
- 3
- 4
- 5
- stage: Remote_2_13
displayName: Remote 2.13
dependsOn: []
jobs:
- template: templates/matrix.yml
parameters:
testFormat: 2.13/{0}
targets:
- name: RHEL 8.5
test: rhel/8.5
groups:
- 1
- 2
- 3
- 4
- 5

## Finally

- stage: Summary
condition: succeededOrFailed()
dependsOn:
- Ansible_devel
- Ansible_2_16
- Ansible_2_15
- Ansible_2_14
- Ansible_2_13
- Remote_devel
- Remote_2_16
- Remote_2_15
- Remote_2_14
- Remote_2_13
- Docker_devel
- Docker_2_16
- Docker_2_15
- Docker_2_14
- Docker_2_13
- Docker_community_devel
jobs:
- template: templates/coverage.yml
27 changes: 27 additions & 0 deletions .github/workflows/ansible-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ jobs:
ansible:
- '2.11'
- '2.12'
- '2.13'
# Ansible-test on various stable branches does not yet work well with cgroups v2.
# Since ubuntu-latest now uses Ubuntu 22.04, we need to fall back to the ubuntu-20.04
# image for these stable branches. The list of branches where this is necessary will
Expand Down Expand Up @@ -68,6 +69,7 @@ jobs:
ansible:
- '2.11'
- '2.12'
- '2.13'

steps:
- name: >-
Expand Down Expand Up @@ -153,6 +155,31 @@ jobs:
docker: ubuntu1804
python: ''
target: azp/5/
# 2.12
- ansible: '2.13'
docker: fedora35
python: ''
target: azp/4/
- ansible: '2.13'
docker: fedora35
python: ''
target: azp/5/
- ansible: '2.13'
docker: opensuse15py2
python: ''
target: azp/4/
- ansible: '2.13'
docker: opensuse15py2
python: ''
target: azp/5/
- ansible: '2.13'
docker: alpine3
python: ''
target: azp/4/
- ansible: '2.13'
docker: alpine3
python: ''
target: azp/5/

steps:
- name: >-
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Please note that this collection does **not** support Windows targets. The conne

## Tested with Ansible

Tested with the current ansible-core 2.11, ansible-core 2.12, ansible-core 2.13, and ansible-core 2.14 releases, and the current development version of ansible-core. Ansible/ansible-base versions before 2.11.0 are not supported.
Tested with the current ansible-core 2.11, ansible-core 2.12, ansible-core 2.13, ansible-core 2.14, ansible-core 2.15, and ansible-core 2.16 releases, and the current development version of ansible-core. Ansible/ansible-base versions before 2.11.0 are not supported.

Please note that Ansible 2.9 and ansible-base 2.10 are no longer supported. If you need to use them, use community.docker 2.x.y. Also note that this collection does not work with ansible-core 2.11 (this includes ansible-base and Ansible 2.9) on Python 3.12+.

Expand Down
1 change: 1 addition & 0 deletions tests/sanity/ignore-2.17.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
plugins/modules/docker_container_copy_into.py validate-modules:undocumented-parameter # _max_file_size_for_diff is used by the action plugin
3 changes: 3 additions & 0 deletions tests/sanity/ignore-2.17.txt.license
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
SPDX-License-Identifier: GPL-3.0-or-later
SPDX-FileCopyrightText: Ansible Project

0 comments on commit d9f49fc

Please sign in to comment.