diff --git a/changelogs/fragments/515-update-sanity-for-2-15.yml b/changelogs/fragments/515-update-sanity-for-2-15.yml new file mode 100644 index 0000000000..3288aec170 --- /dev/null +++ b/changelogs/fragments/515-update-sanity-for-2-15.yml @@ -0,0 +1,2 @@ +trivial: + - update for ansible 2.15 sanity (https://github.com/ansible-collections/kubernetes.core/pull/515). diff --git a/plugins/module_utils/helm.py b/plugins/module_utils/helm.py index 07e6458931..d63d78ce0b 100644 --- a/plugins/module_utils/helm.py +++ b/plugins/module_utils/helm.py @@ -20,6 +20,7 @@ import yaml HAS_YAML = True + YAML_IMP_ERR = None except ImportError: YAML_IMP_ERR = traceback.format_exc() HAS_YAML = False diff --git a/plugins/modules/helm.py b/plugins/modules/helm.py index b1b77f6376..fe3e98a471 100644 --- a/plugins/modules/helm.py +++ b/plugins/modules/helm.py @@ -345,6 +345,7 @@ import yaml IMP_YAML = True + IMP_YAML_ERR = None except ImportError: IMP_YAML_ERR = traceback.format_exc() IMP_YAML = False diff --git a/plugins/modules/helm_info.py b/plugins/modules/helm_info.py index 4542450ec4..c0294bc899 100644 --- a/plugins/modules/helm_info.py +++ b/plugins/modules/helm_info.py @@ -118,6 +118,7 @@ import yaml IMP_YAML = True + IMP_YAML_ERR = None except ImportError: IMP_YAML_ERR = traceback.format_exc() IMP_YAML = False diff --git a/plugins/modules/helm_repository.py b/plugins/modules/helm_repository.py index cb232a5f69..d98a020275 100644 --- a/plugins/modules/helm_repository.py +++ b/plugins/modules/helm_repository.py @@ -173,6 +173,7 @@ import yaml IMP_YAML = True + IMP_YAML_ERR = None except ImportError: IMP_YAML_ERR = traceback.format_exc() IMP_YAML = False diff --git a/plugins/modules/helm_template.py b/plugins/modules/helm_template.py index 9141e855e2..044a248e40 100644 --- a/plugins/modules/helm_template.py +++ b/plugins/modules/helm_template.py @@ -176,6 +176,7 @@ import yaml IMP_YAML = True + IMP_YAML_ERR = None except ImportError: IMP_YAML_ERR = traceback.format_exc() IMP_YAML = False diff --git a/tests/sanity/ignore-2.10.txt b/tests/sanity/ignore-2.10.txt index b985fe9f33..61bd6825d8 100644 --- a/tests/sanity/ignore-2.10.txt +++ b/tests/sanity/ignore-2.10.txt @@ -31,6 +31,7 @@ plugins/doc_fragments/k8s_resource_options.py future-import-boilerplate!skip plugins/module_utils/helm.py future-import-boilerplate!skip plugins/module_utils/apply.py future-import-boilerplate!skip plugins/module_utils/hashes.py future-import-boilerplate!skip +plugins/module_utils/helm_args_common.py future-import-boilerplate!skip plugins/module_utils/version.py future-import-boilerplate!skip plugins/module_utils/_version.py future-import-boilerplate!skip plugins/module_utils/copy.py future-import-boilerplate!skip @@ -106,6 +107,7 @@ plugins/doc_fragments/k8s_resource_options.py metaclass-boilerplate!skip plugins/module_utils/helm.py metaclass-boilerplate!skip plugins/module_utils/apply.py metaclass-boilerplate!skip plugins/module_utils/hashes.py metaclass-boilerplate!skip +plugins/module_utils/helm_args_common.py metaclass-boilerplate!skip plugins/module_utils/version.py metaclass-boilerplate!skip plugins/module_utils/_version.py metaclass-boilerplate!skip plugins/module_utils/copy.py metaclass-boilerplate!skip @@ -235,6 +237,9 @@ plugins/module_utils/apply.py import-3.5!skip plugins/module_utils/hashes.py import-2.6!skip plugins/module_utils/hashes.py import-2.7!skip plugins/module_utils/hashes.py import-3.5!skip +plugins/module_utils/helm_args_common.py import-2.6!skip +plugins/module_utils/helm_args_common.py import-2.7!skip +plugins/module_utils/helm_args_common.py import-3.5!skip plugins/module_utils/version.py import-2.6!skip plugins/module_utils/version.py import-2.7!skip plugins/module_utils/version.py import-3.5!skip @@ -328,6 +333,9 @@ plugins/module_utils/apply.py compile-3.5!skip plugins/module_utils/hashes.py compile-2.6!skip plugins/module_utils/hashes.py compile-2.7!skip plugins/module_utils/hashes.py compile-3.5!skip +plugins/module_utils/helm_args_common.py compile-2.6!skip +plugins/module_utils/helm_args_common.py compile-2.7!skip +plugins/module_utils/helm_args_common.py compile-3.5!skip plugins/module_utils/version.py compile-2.6!skip plugins/module_utils/version.py compile-2.7!skip plugins/module_utils/version.py compile-3.5!skip @@ -523,6 +531,9 @@ tests/integration/targets/k8s_copy/library/k8s_create_file.py compile-3.5!skip tests/integration/targets/k8s_copy/library/kubectl_file_compare.py compile-2.6!skip tests/integration/targets/k8s_copy/library/kubectl_file_compare.py compile-2.7!skip tests/integration/targets/k8s_copy/library/kubectl_file_compare.py compile-3.5!skip +tests/integration/targets/setup_kubeconfig/library/test_inventory_read_credentials.py compile-2.6!skip +tests/integration/targets/setup_kubeconfig/library/test_inventory_read_credentials.py compile-2.7!skip +tests/integration/targets/setup_kubeconfig/library/test_inventory_read_credentials.py compile-3.5!skip tests/integration/targets/helm/library/helm_test_version.py compile-2.6!skip tests/integration/targets/helm/library/helm_test_version.py compile-2.7!skip tests/integration/targets/helm/library/helm_test_version.py compile-3.5!skip @@ -548,6 +559,7 @@ plugins/modules/k8s_json_patch.py pylint!skip plugins/module_utils/helm.py pylint!skip plugins/module_utils/apply.py pylint!skip plugins/module_utils/hashes.py pylint!skip +plugins/module_utils/helm_args_common.py pylint!skip plugins/module_utils/version.py pylint!skip plugins/module_utils/_version.py pylint!skip plugins/module_utils/copy.py pylint!skip @@ -569,6 +581,7 @@ plugins/module_utils/k8s/service.py pylint!skip plugins/module_utils/k8s/exceptions.py pylint!skip tests/integration/targets/k8s_copy/library/k8s_create_file.py pylint!skip tests/integration/targets/k8s_copy/library/kubectl_file_compare.py pylint!skip +tests/integration/targets/setup_kubeconfig/library/test_inventory_read_credentials.py pylint!skip tests/integration/targets/helm/library/helm_test_version.py pylint!skip tests/unit/conftest.py pylint!skip tests/unit/utils/ansible_module_mock.py pylint!skip diff --git a/tests/sanity/ignore-2.11.txt b/tests/sanity/ignore-2.11.txt index a3fbab187a..53b2ef90e8 100644 --- a/tests/sanity/ignore-2.11.txt +++ b/tests/sanity/ignore-2.11.txt @@ -38,6 +38,7 @@ plugins/doc_fragments/k8s_resource_options.py future-import-boilerplate!skip plugins/module_utils/helm.py future-import-boilerplate!skip plugins/module_utils/apply.py future-import-boilerplate!skip plugins/module_utils/hashes.py future-import-boilerplate!skip +plugins/module_utils/helm_args_common.py future-import-boilerplate!skip plugins/module_utils/version.py future-import-boilerplate!skip plugins/module_utils/_version.py future-import-boilerplate!skip plugins/module_utils/copy.py future-import-boilerplate!skip @@ -113,6 +114,7 @@ plugins/doc_fragments/k8s_resource_options.py metaclass-boilerplate!skip plugins/module_utils/helm.py metaclass-boilerplate!skip plugins/module_utils/apply.py metaclass-boilerplate!skip plugins/module_utils/hashes.py metaclass-boilerplate!skip +plugins/module_utils/helm_args_common.py metaclass-boilerplate!skip plugins/module_utils/version.py metaclass-boilerplate!skip plugins/module_utils/_version.py metaclass-boilerplate!skip plugins/module_utils/copy.py metaclass-boilerplate!skip @@ -212,6 +214,9 @@ plugins/module_utils/apply.py import-3.5!skip plugins/module_utils/hashes.py import-2.6!skip plugins/module_utils/hashes.py import-2.7!skip plugins/module_utils/hashes.py import-3.5!skip +plugins/module_utils/helm_args_common.py import-2.6!skip +plugins/module_utils/helm_args_common.py import-2.7!skip +plugins/module_utils/helm_args_common.py import-3.5!skip plugins/module_utils/version.py import-2.6!skip plugins/module_utils/version.py import-2.7!skip plugins/module_utils/version.py import-3.5!skip @@ -380,6 +385,9 @@ plugins/module_utils/apply.py compile-3.5!skip plugins/module_utils/hashes.py compile-2.6!skip plugins/module_utils/hashes.py compile-2.7!skip plugins/module_utils/hashes.py compile-3.5!skip +plugins/module_utils/helm_args_common.py compile-2.6!skip +plugins/module_utils/helm_args_common.py compile-2.7!skip +plugins/module_utils/helm_args_common.py compile-3.5!skip plugins/module_utils/version.py compile-2.6!skip plugins/module_utils/version.py compile-2.7!skip plugins/module_utils/version.py compile-3.5!skip @@ -575,6 +583,9 @@ tests/integration/targets/k8s_copy/library/k8s_create_file.py compile-3.5!skip tests/integration/targets/k8s_copy/library/kubectl_file_compare.py compile-2.6!skip tests/integration/targets/k8s_copy/library/kubectl_file_compare.py compile-2.7!skip tests/integration/targets/k8s_copy/library/kubectl_file_compare.py compile-3.5!skip +tests/integration/targets/setup_kubeconfig/library/test_inventory_read_credentials.py compile-2.6!skip +tests/integration/targets/setup_kubeconfig/library/test_inventory_read_credentials.py compile-2.7!skip +tests/integration/targets/setup_kubeconfig/library/test_inventory_read_credentials.py compile-3.5!skip tests/integration/targets/helm/library/helm_test_version.py compile-2.6!skip tests/integration/targets/helm/library/helm_test_version.py compile-2.7!skip tests/integration/targets/helm/library/helm_test_version.py compile-3.5!skip diff --git a/tests/sanity/ignore-2.15.txt b/tests/sanity/ignore-2.15.txt new file mode 100644 index 0000000000..58af38eb86 --- /dev/null +++ b/tests/sanity/ignore-2.15.txt @@ -0,0 +1,34 @@ +plugins/module_utils/client/discovery.py import-3.6!skip +plugins/module_utils/client/discovery.py import-3.7!skip +plugins/module_utils/client/discovery.py import-3.8!skip +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.6!skip +plugins/module_utils/client/resource.py import-3.7!skip +plugins/module_utils/client/resource.py import-3.8!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.6!skip +plugins/module_utils/k8sdynamicclient.py import-3.7!skip +plugins/module_utils/k8sdynamicclient.py import-3.8!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/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/k8s_scale/files/deployment.yaml yamllint!skip +tests/sanity/refresh_ignore_files shebang!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 diff --git a/tests/sanity/ignore-2.9.txt b/tests/sanity/ignore-2.9.txt index 0d0b2883c4..a2b1c85869 100644 --- a/tests/sanity/ignore-2.9.txt +++ b/tests/sanity/ignore-2.9.txt @@ -28,6 +28,7 @@ plugins/doc_fragments/k8s_resource_options.py future-import-boilerplate!skip plugins/module_utils/helm.py future-import-boilerplate!skip plugins/module_utils/apply.py future-import-boilerplate!skip plugins/module_utils/hashes.py future-import-boilerplate!skip +plugins/module_utils/helm_args_common.py future-import-boilerplate!skip plugins/module_utils/version.py future-import-boilerplate!skip plugins/module_utils/_version.py future-import-boilerplate!skip plugins/module_utils/copy.py future-import-boilerplate!skip @@ -103,6 +104,7 @@ plugins/doc_fragments/k8s_resource_options.py metaclass-boilerplate!skip plugins/module_utils/helm.py metaclass-boilerplate!skip plugins/module_utils/apply.py metaclass-boilerplate!skip plugins/module_utils/hashes.py metaclass-boilerplate!skip +plugins/module_utils/helm_args_common.py metaclass-boilerplate!skip plugins/module_utils/version.py metaclass-boilerplate!skip plugins/module_utils/_version.py metaclass-boilerplate!skip plugins/module_utils/copy.py metaclass-boilerplate!skip @@ -232,6 +234,9 @@ plugins/module_utils/apply.py import-3.5!skip plugins/module_utils/hashes.py import-2.6!skip plugins/module_utils/hashes.py import-2.7!skip plugins/module_utils/hashes.py import-3.5!skip +plugins/module_utils/helm_args_common.py import-2.6!skip +plugins/module_utils/helm_args_common.py import-2.7!skip +plugins/module_utils/helm_args_common.py import-3.5!skip plugins/module_utils/version.py import-2.6!skip plugins/module_utils/version.py import-2.7!skip plugins/module_utils/version.py import-3.5!skip @@ -325,6 +330,9 @@ plugins/module_utils/apply.py compile-3.5!skip plugins/module_utils/hashes.py compile-2.6!skip plugins/module_utils/hashes.py compile-2.7!skip plugins/module_utils/hashes.py compile-3.5!skip +plugins/module_utils/helm_args_common.py compile-2.6!skip +plugins/module_utils/helm_args_common.py compile-2.7!skip +plugins/module_utils/helm_args_common.py compile-3.5!skip plugins/module_utils/version.py compile-2.6!skip plugins/module_utils/version.py compile-2.7!skip plugins/module_utils/version.py compile-3.5!skip @@ -520,6 +528,9 @@ tests/integration/targets/k8s_copy/library/k8s_create_file.py compile-3.5!skip tests/integration/targets/k8s_copy/library/kubectl_file_compare.py compile-2.6!skip tests/integration/targets/k8s_copy/library/kubectl_file_compare.py compile-2.7!skip tests/integration/targets/k8s_copy/library/kubectl_file_compare.py compile-3.5!skip +tests/integration/targets/setup_kubeconfig/library/test_inventory_read_credentials.py compile-2.6!skip +tests/integration/targets/setup_kubeconfig/library/test_inventory_read_credentials.py compile-2.7!skip +tests/integration/targets/setup_kubeconfig/library/test_inventory_read_credentials.py compile-3.5!skip tests/integration/targets/helm/library/helm_test_version.py compile-2.6!skip tests/integration/targets/helm/library/helm_test_version.py compile-2.7!skip tests/integration/targets/helm/library/helm_test_version.py compile-3.5!skip @@ -545,6 +556,7 @@ plugins/modules/k8s_json_patch.py pylint!skip plugins/module_utils/helm.py pylint!skip plugins/module_utils/apply.py pylint!skip plugins/module_utils/hashes.py pylint!skip +plugins/module_utils/helm_args_common.py pylint!skip plugins/module_utils/version.py pylint!skip plugins/module_utils/_version.py pylint!skip plugins/module_utils/copy.py pylint!skip @@ -566,6 +578,7 @@ plugins/module_utils/k8s/service.py pylint!skip plugins/module_utils/k8s/exceptions.py pylint!skip tests/integration/targets/k8s_copy/library/k8s_create_file.py pylint!skip tests/integration/targets/k8s_copy/library/kubectl_file_compare.py pylint!skip +tests/integration/targets/setup_kubeconfig/library/test_inventory_read_credentials.py pylint!skip tests/integration/targets/helm/library/helm_test_version.py pylint!skip tests/unit/conftest.py pylint!skip tests/unit/utils/ansible_module_mock.py pylint!skip diff --git a/tests/sanity/refresh_ignore_files b/tests/sanity/refresh_ignore_files index 405d9eee6a..1549124a32 100644 --- a/tests/sanity/refresh_ignore_files +++ b/tests/sanity/refresh_ignore_files @@ -14,6 +14,7 @@ ANSIBLE_VERSIONS = { "2.12": ["3.6", "3.7", "3.8", "3.9", "3.10"], "2.13": ["3.6", "3.7", "3.8", "3.9", "3.10"], "2.14": ["3.6", "3.7", "3.8", "3.9", "3.10"], + "2.15": ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11"], } IMPORT_SKIPS = [