From d9f49fc073a9ba724651fcbf98205ecc90fc9f07 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Tue, 19 Sep 2023 17:51:26 +0200 Subject: [PATCH] Add ansible-core 2.16 to the matrix. (#686) --- .azure-pipelines/azure-pipelines.yml | 94 +++++++++++++--------------- .github/workflows/ansible-test.yml | 27 ++++++++ README.md | 2 +- tests/sanity/ignore-2.17.txt | 1 + tests/sanity/ignore-2.17.txt.license | 3 + 5 files changed, 77 insertions(+), 50 deletions(-) create mode 100644 tests/sanity/ignore-2.17.txt create mode 100644 tests/sanity/ignore-2.17.txt.license diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index 087dca1da..885b23ea9 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -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: [] @@ -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 @@ -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 @@ -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: [] @@ -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 @@ -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: [] @@ -249,22 +261,6 @@ 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 @@ -272,17 +268,17 @@ stages: 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 diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml index 6aa69f015..046bda929 100644 --- a/.github/workflows/ansible-test.yml +++ b/.github/workflows/ansible-test.yml @@ -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 @@ -68,6 +69,7 @@ jobs: ansible: - '2.11' - '2.12' + - '2.13' steps: - name: >- @@ -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: >- diff --git a/README.md b/README.md index e82e0a8ed..7493e85e6 100644 --- a/README.md +++ b/README.md @@ -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+. diff --git a/tests/sanity/ignore-2.17.txt b/tests/sanity/ignore-2.17.txt new file mode 100644 index 000000000..12e0b26f9 --- /dev/null +++ b/tests/sanity/ignore-2.17.txt @@ -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 diff --git a/tests/sanity/ignore-2.17.txt.license b/tests/sanity/ignore-2.17.txt.license new file mode 100644 index 000000000..edff8c768 --- /dev/null +++ b/tests/sanity/ignore-2.17.txt.license @@ -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