From 54ee93faec766cd6d4469a9894fe73753e18de04 Mon Sep 17 00:00:00 2001 From: "patchback[bot]" <45432694+patchback[bot]@users.noreply.github.com> Date: Sat, 9 Oct 2021 11:18:37 +0200 Subject: [PATCH] [PR #3531/d1f820ed backport][stable-1] Fix shellcheck error (#3532) * Fix shellcheck error. (#3531) (cherry picked from commit d1f820ed06a55e5ca643346c237d7e1da45b78e2) * Vendored ipaddress is still present in stable-1 branch, so use that one. Co-authored-by: Felix Fontein --- .../targets/docker_container/filter_plugins/ipaddr_tools.py | 2 +- tests/utils/shippable/shippable.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/integration/targets/docker_container/filter_plugins/ipaddr_tools.py b/tests/integration/targets/docker_container/filter_plugins/ipaddr_tools.py index 1b809aae8e..33ebe9a741 100644 --- a/tests/integration/targets/docker_container/filter_plugins/ipaddr_tools.py +++ b/tests/integration/targets/docker_container/filter_plugins/ipaddr_tools.py @@ -18,7 +18,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible_collections.community.crypto.plugins.module_utils.compat import ipaddress +from ansible_collections.community.general.plugins.module_utils.compat import ipaddress def _normalize_ipaddr(ipaddr): diff --git a/tests/utils/shippable/shippable.sh b/tests/utils/shippable/shippable.sh index b311d6c829..d22a6df74d 100755 --- a/tests/utils/shippable/shippable.sh +++ b/tests/utils/shippable/shippable.sh @@ -50,7 +50,7 @@ function retry echo "@* -> ${result}" done echo "Command '@*' failed 3 times!" - exit -1 + exit 255 } command -v pip