From bb599542e8bbf2579ef285635477ac52804a81ab Mon Sep 17 00:00:00 2001 From: Yuriy Novostavskiy Date: Tue, 15 Jul 2025 16:53:17 +0300 Subject: [PATCH] add sanity/ignore for 2.20 and remove 2.16 and 2.14 (#954) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit SUMMARY Now that ansible-core 2.19.0rc1 has been released, ansible-core’s devel branch has been bumped from 2.19.0.dev0 to 2.20.0.dev0. This requires collection CI to be updated with using tests/sanity/ignore-2.20.txt. In the same time, ignore-2.14.txt ignore-2.15.txt is not required anymore as they are excluded from the matrix. This PR is precific to stable-5 (and probably to be cherry-picked to stable-3) and is not required to main and stable-6 and such changes is already here. ISSUE TYPE CI Pull Request COMPONENT NAME CI ADDITIONAL INFORMATION It's required to have passed CI for #952 Reviewed-by: Bianca Henderson Reviewed-by: Alina Buzachis --- tests/sanity/ignore-2.14.txt | 31 ------------------- .../{ignore-2.15.txt => ignore-2.20.txt} | 14 ++++----- 2 files changed, 7 insertions(+), 38 deletions(-) delete mode 100644 tests/sanity/ignore-2.14.txt rename tests/sanity/{ignore-2.15.txt => ignore-2.20.txt} (82%) diff --git a/tests/sanity/ignore-2.14.txt b/tests/sanity/ignore-2.14.txt deleted file mode 100644 index bdcaf2c1..00000000 --- a/tests/sanity/ignore-2.14.txt +++ /dev/null @@ -1,31 +0,0 @@ -plugins/module_utils/client/discovery.py import-3.9!skip -plugins/module_utils/client/discovery.py import-3.10!skip -plugins/module_utils/client/discovery.py import-3.11!skip -plugins/module_utils/client/resource.py import-3.9!skip -plugins/module_utils/client/resource.py import-3.10!skip -plugins/module_utils/client/resource.py import-3.11!skip -plugins/module_utils/k8sdynamicclient.py import-3.9!skip -plugins/module_utils/k8sdynamicclient.py import-3.10!skip -plugins/module_utils/k8sdynamicclient.py import-3.11!skip -plugins/modules/k8s.py validate-modules:parameter-type-not-in-doc -plugins/modules/k8s_scale.py validate-modules:parameter-type-not-in-doc -plugins/modules/k8s_service.py validate-modules:parameter-type-not-in-doc -tests/unit/module_utils/fixtures/clusteroperator.yml yamllint!skip -tests/unit/module_utils/fixtures/definitions.yml yamllint!skip -tests/unit/module_utils/fixtures/deployments.yml yamllint!skip -tests/unit/module_utils/fixtures/pods.yml yamllint!skip -tests/integration/targets/helm/files/appversionless-chart-v2/templates/configmap.yaml yamllint!skip -tests/integration/targets/helm/files/appversionless-chart/templates/configmap.yaml yamllint!skip -tests/integration/targets/helm/files/test-chart-v2/templates/configmap.yaml yamllint!skip -tests/integration/targets/helm/files/test-chart/templates/configmap.yaml yamllint!skip -tests/integration/targets/helm_diff/files/test-chart/templates/configmap.yaml yamllint!skip -tests/integration/targets/k8s_scale/files/deployment.yaml yamllint!skip -plugins/modules/k8s.py validate-modules:return-syntax-error -plugins/modules/k8s_scale.py validate-modules:return-syntax-error -plugins/modules/k8s_service.py validate-modules:return-syntax-error -plugins/modules/k8s_taint.py validate-modules:return-syntax-error -tests/integration/targets/k8s_delete/files/deployments.yaml yamllint!skip -tests/integration/targets/helm_diff/files/test-chart-reuse-values/templates/configmap.yaml yamllint!skip -tests/integration/targets/helm_registry_auth/tasks/main.yaml yamllint!skip -tests/integration/targets/helm_diff/files/test-chart-deployment-time/templates/configmap.yaml yamllint!skip - diff --git a/tests/sanity/ignore-2.15.txt b/tests/sanity/ignore-2.20.txt similarity index 82% rename from tests/sanity/ignore-2.15.txt rename to tests/sanity/ignore-2.20.txt index f534f27a..46d90316 100644 --- a/tests/sanity/ignore-2.15.txt +++ b/tests/sanity/ignore-2.20.txt @@ -1,12 +1,12 @@ -plugins/module_utils/client/discovery.py import-3.9!skip -plugins/module_utils/client/discovery.py import-3.10!skip plugins/module_utils/client/discovery.py import-3.11!skip -plugins/module_utils/client/resource.py import-3.9!skip -plugins/module_utils/client/resource.py import-3.10!skip +plugins/module_utils/client/discovery.py import-3.12!skip +plugins/module_utils/client/discovery.py import-3.13!skip plugins/module_utils/client/resource.py import-3.11!skip -plugins/module_utils/k8sdynamicclient.py import-3.9!skip -plugins/module_utils/k8sdynamicclient.py import-3.10!skip +plugins/module_utils/client/resource.py import-3.12!skip +plugins/module_utils/client/resource.py import-3.13!skip plugins/module_utils/k8sdynamicclient.py import-3.11!skip +plugins/module_utils/k8sdynamicclient.py import-3.12!skip +plugins/module_utils/k8sdynamicclient.py import-3.13!skip plugins/module_utils/version.py pylint!skip plugins/modules/k8s.py validate-modules:parameter-type-not-in-doc plugins/modules/k8s_scale.py validate-modules:parameter-type-not-in-doc @@ -28,4 +28,4 @@ plugins/modules/k8s_service.py validate-modules:return-syntax-error plugins/modules/k8s_taint.py validate-modules:return-syntax-error tests/integration/targets/helm_diff/files/test-chart-reuse-values/templates/configmap.yaml yamllint!skip tests/integration/targets/helm_registry_auth/tasks/main.yaml yamllint!skip -tests/integration/targets/helm_diff/files/test-chart-deployment-time/templates/configmap.yaml yamllint!skip +tests/integration/targets/helm_diff/files/test-chart-deployment-time/templates/configmap.yaml yamllint!skip \ No newline at end of file