diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml index 6e8ae0e98f..73afe08611 100644 --- a/.github/workflows/ansible-test.yml +++ b/.github/workflows/ansible-test.yml @@ -29,7 +29,6 @@ jobs: strategy: matrix: ansible: - - '2.17' - '2.18' runs-on: ubuntu-latest steps: @@ -58,12 +57,6 @@ jobs: exclude: - ansible: '' include: - - ansible: '2.17' - python: '3.7' - - ansible: '2.17' - python: '3.10' - - ansible: '2.17' - python: '3.12' - ansible: '2.18' python: '3.8' - ansible: '2.18' @@ -105,52 +98,6 @@ jobs: exclude: - ansible: '' include: - # 2.17 - - ansible: '2.17' - docker: fedora39 - python: '' - target: azp/posix/1/ - - ansible: '2.17' - docker: fedora39 - python: '' - target: azp/posix/2/ - - ansible: '2.17' - docker: fedora39 - python: '' - target: azp/posix/3/ - - ansible: '2.17' - docker: ubuntu2004 - python: '' - target: azp/posix/1/ - - ansible: '2.17' - docker: ubuntu2004 - python: '' - target: azp/posix/2/ - - ansible: '2.17' - docker: ubuntu2004 - python: '' - target: azp/posix/3/ - - ansible: '2.17' - docker: alpine319 - python: '' - target: azp/posix/1/ - - ansible: '2.17' - docker: alpine319 - python: '' - target: azp/posix/2/ - - ansible: '2.17' - docker: alpine319 - python: '' - target: azp/posix/3/ - # Right now all generic tests are disabled. Uncomment when at least one of them is re-enabled. - # - ansible: '2.17' - # docker: default - # python: '3.7' - # target: azp/generic/1/ - # - ansible: '2.17' - # docker: default - # python: '3.12' - # target: azp/generic/1/ # 2.18 - ansible: '2.18' docker: fedora40 diff --git a/README.md b/README.md index d580429189..e9cfe8d1d4 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ For more information about communication, see the [Ansible communication guide]( ## Tested with Ansible -Tested with the current ansible-core 2.17, ansible-core 2.18, ansible-core 2.19, ansible-core 2.20, ansible-core 2.21 releases and the current development version of ansible-core. Ansible-core versions before 2.17.0 are not supported. This includes all ansible-base 2.10 and Ansible 2.9 releases. +Tested with the current ansible-core 2.18, ansible-core 2.19, ansible-core 2.20, ansible-core 2.21 releases and the current development version of ansible-core. Ansible-core versions before 2.18.0 are not supported. This includes all ansible-base 2.10 and Ansible 2.9 releases. ## External requirements diff --git a/antsibull-nox.toml b/antsibull-nox.toml index 5fc0e5ec57..04355c5be5 100644 --- a/antsibull-nox.toml +++ b/antsibull-nox.toml @@ -8,10 +8,6 @@ "community.docker" = "git+https://github.com/ansible-collections/community.docker.git,main" "community.internal_test_tools" = "git+https://github.com/ansible-collections/community.internal_test_tools.git,main" -[collection_sources_per_ansible.'2.16'] -# community.crypto's main branch needs ansible-core >= 2.17 -"community.crypto" = "git+https://github.com/ansible-collections/community.crypto.git,stable-2" - [vcs] vcs = "git" development_branch = "main" diff --git a/changelogs/fragments/11906-ansible-core.yml b/changelogs/fragments/11906-ansible-core.yml new file mode 100644 index 0000000000..ed168e34ee --- /dev/null +++ b/changelogs/fragments/11906-ansible-core.yml @@ -0,0 +1,2 @@ +breaking_changes: + - The collection no longer supports ansible-core 2.17 (https://github.com/ansible-collections/community.general/pull/11906). diff --git a/meta/runtime.yml b/meta/runtime.yml index dd48564069..bfed8495f0 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -3,7 +3,7 @@ # 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 -requires_ansible: '>=2.17.0' +requires_ansible: '>=2.18.0' action_groups: consul: - consul_agent_check diff --git a/tests/sanity/ignore-2.17.txt b/tests/sanity/ignore-2.17.txt deleted file mode 100644 index 393df844db..0000000000 --- a/tests/sanity/ignore-2.17.txt +++ /dev/null @@ -1,10 +0,0 @@ -plugins/module_utils/_crypt.py import-3.11 # Uses deprecated stdlib library 'crypt' -plugins/module_utils/_crypt.py import-3.12 # Uses deprecated stdlib library 'crypt' -plugins/modules/consul_session.py validate-modules:parameter-state-invalid-choice -plugins/modules/iptables_state.py validate-modules:undocumented-parameter # params _back and _timeout used by action plugin -plugins/modules/osx_defaults.py validate-modules:parameter-state-invalid-choice -plugins/modules/parted.py validate-modules:parameter-state-invalid-choice -plugins/modules/rhevm.py validate-modules:parameter-state-invalid-choice -plugins/modules/xfconf.py validate-modules:return-syntax-error -plugins/plugin_utils/_unsafe.py pep8:E704 -tests/unit/plugins/modules/test_gio_mime.yaml no-smart-quotes diff --git a/tests/sanity/ignore-2.17.txt.license b/tests/sanity/ignore-2.17.txt.license deleted file mode 100644 index edff8c7685..0000000000 --- a/tests/sanity/ignore-2.17.txt.license +++ /dev/null @@ -1,3 +0,0 @@ -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