From b2a92ef0bf7c8b73f14c320c2ae9e242f9010fab Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Tue, 19 Sep 2023 17:51:29 +0200 Subject: [PATCH] Add ansible-core 2.16 to the matrix. (#656) --- .azure-pipelines/azure-pipelines.yml | 127 +++++++++++++-------------- .github/workflows/ansible-test.yml | 51 +++++++++++ README.md | 2 +- tests/sanity/ignore-2.17.txt | 2 + tests/sanity/ignore-2.17.txt.license | 3 + 5 files changed, 116 insertions(+), 69 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 ed49cfba..03eb3b5a 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -65,6 +65,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: [] @@ -87,17 +98,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 displayName: Docker devel @@ -107,8 +107,8 @@ stages: parameters: testFormat: devel/linux/{0} targets: - - name: Fedora 38 - test: fedora38 + #- name: Fedora 38 + # test: fedora38 - name: openSUSE 15 test: opensuse15 - name: Ubuntu 22.04 @@ -118,6 +118,19 @@ stages: groups: - 1 - 2 + - 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: + - 1 + - 2 - stage: Docker_2_15 displayName: Docker 2.15 dependsOn: [] @@ -146,27 +159,6 @@ stages: groups: - 1 - 2 - - stage: Docker_2_13 - displayName: Docker 2.13 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - testFormat: 2.13/linux/{0} - targets: - - name: openSUSE 15 py2 - test: opensuse15py2 - - name: Fedora 35 - test: fedora35 - - name: Fedora 34 - test: fedora34 - - name: Ubuntu 18.04 - test: ubuntu1804 - - name: Alpine 3 - test: alpine3 - groups: - - 1 - - 2 ### Community Docker - stage: Docker_community_devel @@ -218,8 +210,8 @@ stages: targets: - name: macOS 13.2 test: macos/13.2 - - name: RHEL 9.2 - test: rhel/9.2 + #- name: RHEL 9.2 + # test: rhel/9.2 - name: RHEL 8.8 test: rhel/8.8 - name: FreeBSD 13.2 @@ -227,6 +219,19 @@ stages: groups: - 1 - 2 + - 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 - stage: Remote_2_15 displayName: Remote 2.15 dependsOn: [] @@ -265,21 +270,6 @@ stages: groups: - 1 - 2 - - 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 - #- name: FreeBSD 13.1 - # test: freebsd/13.1 - groups: - - 1 - - 2 ### Generic - stage: Generic_devel displayName: Generic devel @@ -300,6 +290,20 @@ stages: groups: - 1 - 2 + - stage: Generic_2_16 + displayName: Generic 2.16 + dependsOn: [] + jobs: + - template: templates/matrix.yml + parameters: + nameFormat: Python {0} + testFormat: 2.16/generic/{0} + targets: + - test: 2.7 + - test: "3.11" + groups: + - 1 + - 2 - stage: Generic_2_15 displayName: Generic 2.15 dependsOn: [] @@ -327,19 +331,6 @@ stages: groups: - 1 - 2 - - stage: Generic_2_13 - displayName: Generic 2.13 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - nameFormat: Python {0} - testFormat: 2.13/generic/{0} - targets: - - test: 3.8 - groups: - - 1 - - 2 ## Finally @@ -347,22 +338,22 @@ stages: condition: succeededOrFailed() dependsOn: - Ansible_devel + - Ansible_2_16 - Ansible_2_15 - Ansible_2_14 - - Ansible_2_13 - Remote_devel_extra_vms - 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 - Generic_devel + - Generic_2_16 - Generic_2_15 - Generic_2_14 - - Generic_2_13 jobs: - template: templates/coverage.yml diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml index 325dc527..be831028 100644 --- a/.github/workflows/ansible-test.yml +++ b/.github/workflows/ansible-test.yml @@ -33,6 +33,7 @@ jobs: - '2.10' - '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 @@ -72,6 +73,7 @@ jobs: - '2.10' - '2.11' - '2.12' + - '2.13' steps: - name: >- @@ -202,6 +204,55 @@ jobs: docker: default python: '3.9' target: azp/generic/2/ + # 2.13 + - ansible: '2.13' + docker: opensuse15py2 + python: '' + target: azp/posix/1/ + - ansible: '2.13' + docker: opensuse15py2 + python: '' + target: azp/posix/2/ + - ansible: '2.13' + docker: fedora35 + python: '' + target: azp/posix/1/ + - ansible: '2.13' + docker: fedora35 + python: '' + target: azp/posix/2/ + - ansible: '2.13' + docker: fedora34 + python: '' + target: azp/posix/1/ + - ansible: '2.13' + docker: fedora34 + python: '' + target: azp/posix/2/ + - ansible: '2.13' + docker: ubuntu1804 + python: '' + target: azp/posix/1/ + - ansible: '2.13' + docker: ubuntu1804 + python: '' + target: azp/posix/2/ + - ansible: '2.13' + docker: alpine3 + python: '' + target: azp/posix/1/ + - ansible: '2.13' + docker: alpine3 + python: '' + target: azp/posix/2/ + - ansible: '2.13' + docker: default + python: '3.8' + target: azp/generic/1/ + - ansible: '2.13' + docker: default + python: '3.8' + target: azp/generic/2/ steps: - name: >- diff --git a/README.md b/README.md index 7f4328f7..3cda61f3 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Please note that this collection does **not** support Windows targets. ## Tested with Ansible -Tested with the current Ansible 2.9, ansible-base 2.10, ansible-core 2.11, ansible-core 2.12, ansible-core 2.13, ansible-core 2.14, and ansible-core-2.15 releases and the current development version of ansible-core. Ansible versions before 2.9.10 are not supported. +Tested with the current Ansible 2.9, ansible-base 2.10, 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 versions before 2.9.10 are not supported. ## External requirements diff --git a/tests/sanity/ignore-2.17.txt b/tests/sanity/ignore-2.17.txt new file mode 100644 index 00000000..9ffe1e99 --- /dev/null +++ b/tests/sanity/ignore-2.17.txt @@ -0,0 +1,2 @@ +tests/ee/roles/smoke/library/smoke_ipaddress.py shebang +tests/ee/roles/smoke/library/smoke_pyyaml.py shebang diff --git a/tests/sanity/ignore-2.17.txt.license b/tests/sanity/ignore-2.17.txt.license new file mode 100644 index 00000000..edff8c76 --- /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