Merge pull request #973 from t-woerner/fix-upstream-ansible-test-ansible-2.13

Fix upstream ansible test ansible 2.13

tests/sanity/ignore-2.13.txt

+plugins/module_utils/ansible_freeipa_module.py pylint:ansible-bad-function
+plugins/modules/ipaclient_api.py pylint:ansible-format-automatic-specification
+plugins/modules/ipaclient_join.py pylint:ansible-format-automatic-specification
+plugins/modules/ipaclient_test.py pylint:ansible-format-automatic-specification
+plugins/modules/ipadnsrecord.py pylint:ansible-format-automatic-specification
+plugins/modules/ipadnsrecord.py pylint:use-maxsplit-arg
+plugins/modules/ipareplica_enable_ipa.py pylint:ansible-format-automatic-specification
+plugins/modules/ipareplica_prepare.py pylint:ansible-format-automatic-specification
+plugins/modules/ipareplica_test.py pylint:ansible-format-automatic-specification
+plugins/modules/ipaserver_test.py pylint:ansible-format-automatic-specification
+roles/ipaclient/library/ipaclient_api.py pylint:ansible-format-automatic-specification
+roles/ipaclient/library/ipaclient_join.py pylint:ansible-format-automatic-specification
+roles/ipaclient/library/ipaclient_test.py pylint:ansible-format-automatic-specification
+roles/ipareplica/library/ipareplica_enable_ipa.py pylint:ansible-format-automatic-specification
+roles/ipareplica/library/ipareplica_prepare.py pylint:ansible-format-automatic-specification
+roles/ipareplica/library/ipareplica_test.py pylint:ansible-format-automatic-specification
+roles/ipaserver/library/ipaserver_test.py pylint:ansible-format-automatic-specification
+roles/ipareplica/module_utils/ansible_ipa_replica.py pylint:ansible-format-automatic-specification
+tests/external-signed-ca-with-automatic-copy/external-ca.sh shebang!skip
+tests/pytests/conftest.py pylint:ansible-format-automatic-specification
+tests/sanity/sanity.sh shebang!skip
+tests/user/users.sh shebang!skip
+tests/user/users_absent.sh shebang!skip
+tests/utils.py pylint:ansible-format-automatic-specification
+utils/ansible-doc-test shebang!skip
+utils/ansible-ipa-client-install shebang!skip
+utils/ansible-ipa-replica-install shebang!skip
+utils/ansible-ipa-server-install shebang!skip
+utils/build-galaxy-release.sh shebang!skip
+utils/build-srpm.sh shebang!skip
+utils/changelog shebang!skip
+utils/check_test_configuration.py shebang!skip
+utils/galaxyfy-README.py shebang!skip
+utils/galaxyfy-module-EXAMPLES.py shebang!skip
+utils/galaxyfy-playbook.py shebang!skip
+utils/galaxyfy.py shebang!skip
+utils/gen_modules_docs.sh shebang!skip
+utils/lint_check.sh shebang!skip
+utils/new_module shebang!skip

tests/sanity/sanity.sh

@@ -6,7 +6,7 @@ pushd "${TOPDIR}" >/dev/null || exit 1
 VENV=/tmp/ansible-test-venv
 ANSIBLE_COLLECTION=freeipa-ansible_freeipa
 
-use_docker=$(which docker >/dev/null 2>&1 && echo "True" || echo "False")
+use_docker=$(docker -v >/dev/null 2>&1 && echo "True" || echo "False")
 
 virtualenv "$VENV"
 # shellcheck disable=SC1091