Skip to content

Commit

Permalink
Update for Ansible 2.15 sanity tests (#515)
Browse files Browse the repository at this point in the history
Update for Ansible 2.15 sanity tests

Depends-On: ansible/ansible-zuul-jobs#1639
SUMMARY

Update for Ansible 2.15 sanity tests

Fixes #519
ISSUE TYPE

COMPONENT NAME

ADDITIONAL INFORMATION

Reviewed-by: Bikouo Aubin <None>
  • Loading branch information
gravesm authored Oct 6, 2022
1 parent 0e86fe0 commit 29c75fa
Show file tree
Hide file tree
Showing 11 changed files with 79 additions and 0 deletions.
2 changes: 2 additions & 0 deletions changelogs/fragments/515-update-sanity-for-2-15.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
trivial:
- update for ansible 2.15 sanity (https://github.com/ansible-collections/kubernetes.core/pull/515).
1 change: 1 addition & 0 deletions plugins/module_utils/helm.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import yaml

HAS_YAML = True
YAML_IMP_ERR = None
except ImportError:
YAML_IMP_ERR = traceback.format_exc()
HAS_YAML = False
Expand Down
1 change: 1 addition & 0 deletions plugins/modules/helm.py
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,7 @@
import yaml

IMP_YAML = True
IMP_YAML_ERR = None
except ImportError:
IMP_YAML_ERR = traceback.format_exc()
IMP_YAML = False
Expand Down
1 change: 1 addition & 0 deletions plugins/modules/helm_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@
import yaml

IMP_YAML = True
IMP_YAML_ERR = None
except ImportError:
IMP_YAML_ERR = traceback.format_exc()
IMP_YAML = False
Expand Down
1 change: 1 addition & 0 deletions plugins/modules/helm_repository.py
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@
import yaml

IMP_YAML = True
IMP_YAML_ERR = None
except ImportError:
IMP_YAML_ERR = traceback.format_exc()
IMP_YAML = False
Expand Down
1 change: 1 addition & 0 deletions plugins/modules/helm_template.py
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@
import yaml

IMP_YAML = True
IMP_YAML_ERR = None
except ImportError:
IMP_YAML_ERR = traceback.format_exc()
IMP_YAML = False
Expand Down
13 changes: 13 additions & 0 deletions tests/sanity/ignore-2.10.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
11 changes: 11 additions & 0 deletions tests/sanity/ignore-2.11.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
34 changes: 34 additions & 0 deletions tests/sanity/ignore-2.15.txt
Original file line number Diff line number Diff line change
@@ -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
13 changes: 13 additions & 0 deletions tests/sanity/ignore-2.9.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions tests/sanity/refresh_ignore_files
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down

0 comments on commit 29c75fa

Please sign in to comment.