diff --git a/tests/sanity/ignore-2.10.txt b/tests/sanity/ignore-2.10.txt index 1c45813c1f..bb9da5c56a 100644 --- a/tests/sanity/ignore-2.10.txt +++ b/tests/sanity/ignore-2.10.txt @@ -1957,6 +1957,7 @@ tests/unit/plugins/modules/web_infrastructure/test_apache2_module.py future-impo tests/unit/plugins/modules/web_infrastructure/test_apache2_module.py metaclass-boilerplate tests/unit/plugins/modules/web_infrastructure/test_jenkins_plugin.py future-import-boilerplate tests/unit/plugins/modules/web_infrastructure/test_jenkins_plugin.py metaclass-boilerplate +tests/utils/shippable/check_matrix.py replace-urlopen tests/utils/shippable/timing.py shebang plugins/modules/cloud/digital_ocean/digital_ocean.py validate-modules:deprecation-mismatch # needs to be removed and adjusted once https://github.com/ansible/ansible/pull/67684 has been merged plugins/modules/cloud/digital_ocean/digital_ocean.py validate-modules:invalid-documentation # needs to be removed and adjusted once https://github.com/ansible/ansible/pull/67684 has been merged diff --git a/tests/utils/shippable/sanity.sh b/tests/utils/shippable/sanity.sh index a52030c064..9d3dc30885 100755 --- a/tests/utils/shippable/sanity.sh +++ b/tests/utils/shippable/sanity.sh @@ -34,5 +34,4 @@ fi # shellcheck disable=SC2086 ansible-test sanity --color -v --junit ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} \ --docker --base-branch "${base_branch}" \ - --exclude shippable.yml --exclude tests/utils/ \ "${options[@]}" --allow-disabled diff --git a/tests/utils/shippable/shippable.sh b/tests/utils/shippable/shippable.sh index 707304876a..7b540fe66e 100755 --- a/tests/utils/shippable/shippable.sh +++ b/tests/utils/shippable/shippable.sh @@ -28,6 +28,7 @@ python -V function retry { + # shellcheck disable=SC2034 for repetition in 1 2 3; do set +e "$@" @@ -36,9 +37,9 @@ function retry if [ ${result} == 0 ]; then return ${result} fi - echo "$@ -> ${result}" + echo "@* -> ${result}" done - echo "Command '$@' failed 3 times!" + echo "Command '@*' failed 3 times!" exit -1 }