From b38423c059943c69dc0172a3cdfc784359bc019b Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Tue, 19 Sep 2023 18:03:26 +0200 Subject: [PATCH] Add ansible-core 2.16 to the matrix (#7286) * Add ansible-core 2.16 to the matrix. * Re-order entries. --- .azure-pipelines/azure-pipelines.yml | 168 +++++++++++++-------------- .github/workflows/ansible-test.yml | 47 ++++++++ README.md | 2 +- tests/sanity/ignore-2.17.txt | 23 ++++ tests/sanity/ignore-2.17.txt.license | 3 + 5 files changed, 158 insertions(+), 85 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 d4d524037c..7a3764a851 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -73,6 +73,19 @@ stages: - test: 3 - test: 4 - test: extra + - stage: Sanity_2_16 + displayName: Sanity 2.16 + dependsOn: [] + jobs: + - template: templates/matrix.yml + parameters: + nameFormat: Test {0} + testFormat: 2.16/sanity/{0} + targets: + - test: 1 + - test: 2 + - test: 3 + - test: 4 - stage: Sanity_2_15 displayName: Sanity 2.15 dependsOn: [] @@ -99,19 +112,6 @@ stages: - test: 2 - test: 3 - test: 4 - - stage: Sanity_2_13 - displayName: Sanity 2.13 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - nameFormat: Test {0} - testFormat: 2.13/sanity/{0} - targets: - - test: 1 - - test: 2 - - test: 3 - - test: 4 ### Units - stage: Units_devel displayName: Units devel @@ -129,6 +129,17 @@ stages: - test: 3.9 - test: '3.10' - test: '3.11' + - stage: Units_2_16 + displayName: Units 2.16 + dependsOn: [] + jobs: + - template: templates/matrix.yml + parameters: + nameFormat: Python {0} + testFormat: 2.16/units/{0}/1 + targets: + - test: 3.6 + - test: "3.11" - stage: Units_2_15 displayName: Units 2.15 dependsOn: [] @@ -150,17 +161,6 @@ stages: testFormat: 2.14/units/{0}/1 targets: - test: 3.9 - - stage: Units_2_13 - displayName: Units 2.13 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - nameFormat: Python {0} - testFormat: 2.13/units/{0}/1 - targets: - - test: 2.7 - - test: 3.8 ## Remote - stage: Remote_devel_extra_vms @@ -189,8 +189,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 @@ -199,6 +199,26 @@ stages: - 1 - 2 - 3 + - stage: Remote_2_16 + displayName: Remote 2.16 + dependsOn: [] + jobs: + - template: templates/matrix.yml + parameters: + testFormat: 2.16/{0} + targets: + #- name: macOS 13.2 + # test: macos/13.2 + - name: RHEL 9.2 + test: rhel/9.2 + #- name: RHEL 8.8 + # test: rhel/8.8 + #- name: FreeBSD 13.2 + # test: freebsd/13.2 + groups: + - 1 + - 2 + - 3 - stage: Remote_2_15 displayName: Remote 2.15 dependsOn: [] @@ -231,26 +251,10 @@ stages: targets: - name: RHEL 9.0 test: rhel/9.0 - #- name: FreeBSD 12.4 - # test: freebsd/12.4 - groups: - - 1 - - 2 - - 3 - - stage: Remote_2_13 - displayName: Remote 2.13 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - testFormat: 2.13/{0} - targets: - name: macOS 12.0 test: macos/12.0 - - name: RHEL 8.5 - test: rhel/8.5 - #- name: FreeBSD 13.1 - # test: freebsd/13.1 + #- name: FreeBSD 12.4 + # test: freebsd/12.4 groups: - 1 - 2 @@ -265,8 +269,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 20.04 @@ -279,6 +283,20 @@ stages: - 1 - 2 - 3 + - 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 + - 3 - stage: Docker_2_15 displayName: Docker 2.15 dependsOn: [] @@ -309,24 +327,6 @@ stages: - 1 - 2 - 3 - - 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: - - 1 - - 2 - - 3 ### Community Docker - stage: Docker_community_devel @@ -362,6 +362,16 @@ stages: targets: - test: 2.7 - test: '3.11' + - stage: Generic_2_16 + displayName: Generic 2.16 + dependsOn: [] + jobs: + - template: templates/matrix.yml + parameters: + nameFormat: Python {0} + testFormat: 2.16/generic/{0}/1 + targets: + - test: '3.10' - stage: Generic_2_15 displayName: Generic 2.15 dependsOn: [] @@ -382,42 +392,32 @@ stages: testFormat: 2.14/generic/{0}/1 targets: - test: '3.10' - - stage: Generic_2_13 - displayName: Generic 2.13 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - nameFormat: Python {0} - testFormat: 2.13/generic/{0}/1 - targets: - - test: 3.9 - stage: Summary condition: succeededOrFailed() dependsOn: - Sanity_devel - - Sanity_2_13 - - Sanity_2_14 + - Sanity_2_16 - Sanity_2_15 + - Sanity_2_14 - Units_devel - - Units_2_13 - - Units_2_14 + - Units_2_16 - Units_2_15 + - Units_2_14 - Remote_devel_extra_vms - Remote_devel - - Remote_2_13 - - Remote_2_14 + - Remote_2_16 - Remote_2_15 + - Remote_2_14 - Docker_devel - - Docker_2_13 - - Docker_2_14 + - Docker_2_16 - Docker_2_15 + - Docker_2_14 - Docker_community_devel # Right now all generic tests are disabled. Uncomment when at least one of them is re-enabled. # - Generic_devel -# - Generic_2_13 -# - Generic_2_14 +# - Generic_2_16 # - Generic_2_15 +# - Generic_2_14 jobs: - template: templates/coverage.yml diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml index 09e17dd82f..e38e438094 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 @@ -80,6 +81,10 @@ jobs: python: '2.6' - ansible: '2.12' python: '3.8' + - ansible: '2.13' + python: '2.7' + - ansible: '2.13' + python: '3.8' steps: - name: >- @@ -211,6 +216,48 @@ jobs: # docker: default # python: '3.8' # target: azp/generic/1/ + # 2.13 + - ansible: '2.13' + docker: fedora35 + python: '' + target: azp/posix/1/ + - ansible: '2.13' + docker: fedora35 + python: '' + target: azp/posix/2/ + - ansible: '2.13' + docker: fedora35 + python: '' + target: azp/posix/3/ + - ansible: '2.13' + docker: opensuse15py2 + python: '' + target: azp/posix/1/ + - ansible: '2.13' + docker: opensuse15py2 + python: '' + target: azp/posix/2/ + - ansible: '2.13' + docker: opensuse15py2 + python: '' + target: azp/posix/3/ + - ansible: '2.13' + docker: alpine3 + python: '' + target: azp/posix/1/ + - ansible: '2.13' + docker: alpine3 + python: '' + target: azp/posix/2/ + - ansible: '2.13' + docker: alpine3 + python: '' + target: azp/posix/3/ + # Right now all generic tests are disabled. Uncomment when at least one of them is re-enabled. + # - ansible: '2.13' + # docker: default + # python: '3.9' + # target: azp/generic/1/ steps: - name: >- diff --git a/README.md b/README.md index 39ccf2740f..527447540e 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ If you encounter abusive behavior violating the [Ansible Code of Conduct](https: ## Tested with Ansible -Tested with the current ansible-core 2.11, ansible-core 2.12, ansible-core 2.13, ansible-core 2.14, ansible-core 2.15 releases and the current development version of ansible-core. Ansible-core versions before 2.11.0 are not supported. This includes all ansible-base 2.10 and Ansible 2.9 releases. +Tested with the current ansible-core 2.11, ansible-core 2.12, ansible-core 2.13, ansible-core 2.14, ansible-core 2.15, ansible-core 2.16 releases and the current development version of ansible-core. Ansible-core versions before 2.11.0 are not supported. This includes all ansible-base 2.10 and Ansible 2.9 releases. Parts of this collection will not work with ansible-core 2.11 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 0000000000..a364d8dc0f --- /dev/null +++ b/tests/sanity/ignore-2.17.txt @@ -0,0 +1,23 @@ +plugins/modules/consul.py validate-modules:doc-missing-type +plugins/modules/consul.py validate-modules:undocumented-parameter +plugins/modules/consul_session.py validate-modules:parameter-state-invalid-choice +plugins/modules/gconftool2.py validate-modules:parameter-state-invalid-choice # state=get - removed in 8.0.0 +plugins/modules/homectl.py import-3.11 # Uses deprecated stdlib library 'crypt' +plugins/modules/homectl.py import-3.12 # Uses deprecated stdlib library 'crypt' +plugins/modules/iptables_state.py validate-modules:undocumented-parameter # params _back and _timeout used by action plugin +plugins/modules/lxc_container.py validate-modules:use-run-command-not-popen +plugins/modules/manageiq_policies.py validate-modules:parameter-state-invalid-choice # state=list - removed in 8.0.0 +plugins/modules/manageiq_provider.py validate-modules:doc-choices-do-not-match-spec # missing docs on suboptions +plugins/modules/manageiq_provider.py validate-modules:doc-missing-type # missing docs on suboptions +plugins/modules/manageiq_provider.py validate-modules:parameter-type-not-in-doc # missing docs on suboptions +plugins/modules/manageiq_provider.py validate-modules:undocumented-parameter # missing docs on suboptions +plugins/modules/manageiq_tags.py validate-modules:parameter-state-invalid-choice # state=list - removed in 8.0.0 +plugins/modules/osx_defaults.py validate-modules:parameter-state-invalid-choice +plugins/modules/parted.py validate-modules:parameter-state-invalid-choice +plugins/modules/rax_files_objects.py use-argspec-type-path # module deprecated - removed in 9.0.0 +plugins/modules/rax_files.py validate-modules:parameter-state-invalid-choice # module deprecated - removed in 9.0.0 +plugins/modules/rax.py use-argspec-type-path # module deprecated - removed in 9.0.0 +plugins/modules/rhevm.py validate-modules:parameter-state-invalid-choice +plugins/modules/udm_user.py import-3.11 # Uses deprecated stdlib library 'crypt' +plugins/modules/udm_user.py import-3.12 # Uses deprecated stdlib library 'crypt' +plugins/modules/xfconf.py validate-modules:return-syntax-error diff --git a/tests/sanity/ignore-2.17.txt.license b/tests/sanity/ignore-2.17.txt.license new file mode 100644 index 0000000000..edff8c7685 --- /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