From 8157f9a250947a7a9b7b3acdb50f78ed28a22903 Mon Sep 17 00:00:00 2001 From: Jonas L Date: Tue, 11 Jun 2024 16:21:03 +0200 Subject: [PATCH] feat!: drop support for ansible-core 2.14 (#512) ##### SUMMARY ansible-core 2.14 is EOL since 20 May 2024. https://docs.ansible.com/ansible/devel/reference_appendices/release_and_maintenance.html#ansible-core-support-matrix --- .azure-pipelines/azure-pipelines.yml | 34 ---------- .gitlab-ci.yml | 2 +- .pre-commit-config.yaml | 2 +- .../drop-support-for-ansible-core-2.14.yml | 2 + meta/runtime.yml | 2 +- requirements.txt | 2 +- tests/sanity/ignore-2.14.txt | 68 ------------------- 7 files changed, 6 insertions(+), 106 deletions(-) create mode 100644 changelogs/fragments/drop-support-for-ansible-core-2.14.yml delete mode 100644 tests/sanity/ignore-2.14.txt diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index 9320bb7..c6f9b00 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -77,16 +77,6 @@ stages: - name: Sanity test: 2.15/sanity - - stage: Sanity_2_14 - displayName: Sanity 2.14 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - targets: - - name: Sanity - test: 2.14/sanity - ### Units - stage: Units_devel displayName: Units devel @@ -128,16 +118,6 @@ stages: - name: (py3.9) test: 2.15/units/3.9 - - stage: Units_2_14 - displayName: Units 2.14 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - targets: - - name: (py3.9) - test: 2.14/units/3.9 - ## Integration - stage: Integration_devel displayName: Integration devel @@ -183,17 +163,6 @@ stages: - name: (py3.9) test: 2.15/integration/3.9 - - stage: Integration_2_14 - displayName: Integration 2.14 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - groups: [1, 2, 3] - targets: - - name: (py3.9) - test: 2.14/integration/3.9 - ### Finally - stage: Summary condition: succeededOrFailed() @@ -202,16 +171,13 @@ stages: - Sanity_2_17 - Sanity_2_16 - Sanity_2_15 - - Sanity_2_14 - Units_devel - Units_2_17 - Units_2_16 - Units_2_15 - - Units_2_14 - Integration_devel - Integration_2_17 - Integration_2_16 - Integration_2_15 - - Integration_2_14 jobs: - template: templates/coverage.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a18356f..1e6aaa5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,7 +25,7 @@ sanity: - tags parallel: matrix: - - ANSIBLE_VERSION: ["devel", "2.14", "2.15"] + - ANSIBLE_VERSION: ["devel", "2.15"] GROUP: [1] script: - bash tests/utils/gitlab/gitlab.sh ${ANSIBLE_VERSION}/sanity/${GROUP} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b6a8a86..7b41255 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -56,7 +56,7 @@ repos: name: ansible-lint args: [--offline] additional_dependencies: - - ansible-core>=2.14 + - ansible-core>=2.15 - netaddr - repo: local diff --git a/changelogs/fragments/drop-support-for-ansible-core-2.14.yml b/changelogs/fragments/drop-support-for-ansible-core-2.14.yml new file mode 100644 index 0000000..a25e618 --- /dev/null +++ b/changelogs/fragments/drop-support-for-ansible-core-2.14.yml @@ -0,0 +1,2 @@ +breaking_changes: + - Drop support for ansible-core 2.14. diff --git a/meta/runtime.yml b/meta/runtime.yml index 7f12a86..5a85e33 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -1,4 +1,4 @@ -requires_ansible: ">=2.14.0" +requires_ansible: ">=2.15.0" action_groups: all: diff --git a/requirements.txt b/requirements.txt index 187f780..4ba10a2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -ansible-core>=2.14 +ansible-core>=2.15 # Collections requirements netaddr diff --git a/tests/sanity/ignore-2.14.txt b/tests/sanity/ignore-2.14.txt deleted file mode 100644 index e0d8362..0000000 --- a/tests/sanity/ignore-2.14.txt +++ /dev/null @@ -1,68 +0,0 @@ -plugins/inventory/hcloud.py validate-modules:illegal-future-imports -plugins/inventory/hcloud.py yamllint:unparsable-with-libyaml # bug in ansible-test - https://github.com/ansible/ansible/issues/82353 -plugins/modules/certificate_info.py validate-modules:illegal-future-imports -plugins/modules/certificate_info.py validate-modules:import-before-documentation -plugins/modules/certificate.py validate-modules:illegal-future-imports -plugins/modules/certificate.py validate-modules:import-before-documentation -plugins/modules/datacenter_info.py validate-modules:illegal-future-imports -plugins/modules/datacenter_info.py validate-modules:import-before-documentation -plugins/modules/firewall_info.py validate-modules:illegal-future-imports -plugins/modules/firewall_info.py validate-modules:import-before-documentation -plugins/modules/firewall_resource.py validate-modules:illegal-future-imports -plugins/modules/firewall_resource.py validate-modules:import-before-documentation -plugins/modules/firewall.py validate-modules:illegal-future-imports -plugins/modules/firewall.py validate-modules:import-before-documentation -plugins/modules/floating_ip_info.py validate-modules:illegal-future-imports -plugins/modules/floating_ip_info.py validate-modules:import-before-documentation -plugins/modules/floating_ip.py validate-modules:illegal-future-imports -plugins/modules/floating_ip.py validate-modules:import-before-documentation -plugins/modules/image_info.py validate-modules:illegal-future-imports -plugins/modules/image_info.py validate-modules:import-before-documentation -plugins/modules/iso_info.py validate-modules:illegal-future-imports -plugins/modules/iso_info.py validate-modules:import-before-documentation -plugins/modules/load_balancer_info.py validate-modules:illegal-future-imports -plugins/modules/load_balancer_info.py validate-modules:import-before-documentation -plugins/modules/load_balancer_network.py validate-modules:illegal-future-imports -plugins/modules/load_balancer_network.py validate-modules:import-before-documentation -plugins/modules/load_balancer_service.py validate-modules:illegal-future-imports -plugins/modules/load_balancer_service.py validate-modules:import-before-documentation -plugins/modules/load_balancer_target.py validate-modules:illegal-future-imports -plugins/modules/load_balancer_target.py validate-modules:import-before-documentation -plugins/modules/load_balancer_type_info.py validate-modules:illegal-future-imports -plugins/modules/load_balancer_type_info.py validate-modules:import-before-documentation -plugins/modules/load_balancer.py validate-modules:illegal-future-imports -plugins/modules/load_balancer.py validate-modules:import-before-documentation -plugins/modules/location_info.py validate-modules:illegal-future-imports -plugins/modules/location_info.py validate-modules:import-before-documentation -plugins/modules/network_info.py validate-modules:illegal-future-imports -plugins/modules/network_info.py validate-modules:import-before-documentation -plugins/modules/network.py validate-modules:illegal-future-imports -plugins/modules/network.py validate-modules:import-before-documentation -plugins/modules/placement_group.py validate-modules:illegal-future-imports -plugins/modules/placement_group.py validate-modules:import-before-documentation -plugins/modules/primary_ip_info.py validate-modules:illegal-future-imports -plugins/modules/primary_ip_info.py validate-modules:import-before-documentation -plugins/modules/primary_ip.py validate-modules:illegal-future-imports -plugins/modules/primary_ip.py validate-modules:import-before-documentation -plugins/modules/rdns.py validate-modules:illegal-future-imports -plugins/modules/rdns.py validate-modules:import-before-documentation -plugins/modules/route.py validate-modules:illegal-future-imports -plugins/modules/route.py validate-modules:import-before-documentation -plugins/modules/server_info.py validate-modules:illegal-future-imports -plugins/modules/server_info.py validate-modules:import-before-documentation -plugins/modules/server_network.py validate-modules:illegal-future-imports -plugins/modules/server_network.py validate-modules:import-before-documentation -plugins/modules/server_type_info.py validate-modules:illegal-future-imports -plugins/modules/server_type_info.py validate-modules:import-before-documentation -plugins/modules/server.py validate-modules:illegal-future-imports -plugins/modules/server.py validate-modules:import-before-documentation -plugins/modules/ssh_key_info.py validate-modules:illegal-future-imports -plugins/modules/ssh_key_info.py validate-modules:import-before-documentation -plugins/modules/ssh_key.py validate-modules:illegal-future-imports -plugins/modules/ssh_key.py validate-modules:import-before-documentation -plugins/modules/subnetwork.py validate-modules:illegal-future-imports -plugins/modules/subnetwork.py validate-modules:import-before-documentation -plugins/modules/volume_info.py validate-modules:illegal-future-imports -plugins/modules/volume_info.py validate-modules:import-before-documentation -plugins/modules/volume.py validate-modules:illegal-future-imports -plugins/modules/volume.py validate-modules:import-before-documentation