Avoid sanity excludes so that users can run ansible-test sanity --docker and it usually passes. (#41)
parent
4f7e2c0d2e
commit
970d44a25c
|
@ -13,4 +13,6 @@ tests/unit/plugins/module_utils/conftest.py metaclass-boilerplate
|
||||||
tests/unit/plugins/modules/conftest.py future-import-boilerplate
|
tests/unit/plugins/modules/conftest.py future-import-boilerplate
|
||||||
tests/unit/plugins/modules/conftest.py metaclass-boilerplate
|
tests/unit/plugins/modules/conftest.py metaclass-boilerplate
|
||||||
tests/unit/plugins/modules/utils.py future-import-boilerplate
|
tests/unit/plugins/modules/utils.py future-import-boilerplate
|
||||||
tests/unit/plugins/modules/utils.py metaclass-boilerplate
|
tests/unit/plugins/modules/utils.py metaclass-boilerplate
|
||||||
|
tests/utils/shippable/check_matrix.py replace-urlopen
|
||||||
|
tests/utils/shippable/timing.py shebang
|
||||||
|
|
|
@ -12,3 +12,5 @@ tests/unit/plugins/modules/conftest.py future-import-boilerplate
|
||||||
tests/unit/plugins/modules/conftest.py metaclass-boilerplate
|
tests/unit/plugins/modules/conftest.py metaclass-boilerplate
|
||||||
tests/unit/plugins/modules/utils.py future-import-boilerplate
|
tests/unit/plugins/modules/utils.py future-import-boilerplate
|
||||||
tests/unit/plugins/modules/utils.py metaclass-boilerplate
|
tests/unit/plugins/modules/utils.py metaclass-boilerplate
|
||||||
|
tests/utils/shippable/check_matrix.py replace-urlopen
|
||||||
|
tests/utils/shippable/timing.py shebang
|
||||||
|
|
|
@ -2,11 +2,6 @@
|
||||||
|
|
||||||
set -o pipefail -eux
|
set -o pipefail -eux
|
||||||
|
|
||||||
declare -a args
|
|
||||||
IFS='/:' read -ra args <<< "$1"
|
|
||||||
|
|
||||||
group="${args[1]}"
|
|
||||||
|
|
||||||
if [ "${BASE_BRANCH:-}" ]; then
|
if [ "${BASE_BRANCH:-}" ]; then
|
||||||
base_branch="origin/${BASE_BRANCH}"
|
base_branch="origin/${BASE_BRANCH}"
|
||||||
else
|
else
|
||||||
|
@ -16,5 +11,4 @@ fi
|
||||||
# shellcheck disable=SC2086
|
# shellcheck disable=SC2086
|
||||||
ansible-test sanity --color -v --junit ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} \
|
ansible-test sanity --color -v --junit ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} \
|
||||||
--docker --base-branch "${base_branch}" \
|
--docker --base-branch "${base_branch}" \
|
||||||
--exclude shippable.yml --exclude tests/utils/ \
|
|
||||||
--allow-disabled
|
--allow-disabled
|
||||||
|
|
|
@ -35,6 +35,7 @@ python -V
|
||||||
|
|
||||||
function retry
|
function retry
|
||||||
{
|
{
|
||||||
|
# shellcheck disable=SC2034
|
||||||
for repetition in 1 2 3; do
|
for repetition in 1 2 3; do
|
||||||
set +e
|
set +e
|
||||||
"$@"
|
"$@"
|
||||||
|
@ -43,9 +44,9 @@ function retry
|
||||||
if [ ${result} == 0 ]; then
|
if [ ${result} == 0 ]; then
|
||||||
return ${result}
|
return ${result}
|
||||||
fi
|
fi
|
||||||
echo "$@ -> ${result}"
|
echo "@* -> ${result}"
|
||||||
done
|
done
|
||||||
echo "Command '$@' failed 3 times!"
|
echo "Command '@*' failed 3 times!"
|
||||||
exit -1
|
exit -1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,6 @@ declare -a args
|
||||||
IFS='/:' read -ra args <<< "$1"
|
IFS='/:' read -ra args <<< "$1"
|
||||||
|
|
||||||
version="${args[1]}"
|
version="${args[1]}"
|
||||||
group="${args[2]}"
|
|
||||||
|
|
||||||
if [[ "${COVERAGE:-}" == "--coverage" ]]; then
|
if [[ "${COVERAGE:-}" == "--coverage" ]]; then
|
||||||
timeout=90
|
timeout=90
|
||||||
|
|
Loading…
Reference in New Issue