cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Improve unit test handling in CI after migration. (#67217)

Browse source 
* Improve unit test handling in CI after migration.

* Fix undefined var in bash 4.3 and earlier.

See https://git.savannah.gnu.org/cgit/bash.git/tree/CHANGES?id=3ba697465bc74fab513a26dea700cc82e9f4724e#n878
This commit is contained in:
Matt Clay 2020-02-07 21:28:46 -08:00 committed by GitHub
parent f725dce936
commit a0242b2173
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
test/utils/shippable/units.sh
View file

@ -44,17 +44,27 @@ networks=(
) )
for network in "${networks[@]}"; do for network in "${networks[@]}"; do
group1+=(--exclude "test/units/modules/network/${network}/") test_path="test/units/modules/network/${network}/"
group2+=("test/units/modules/network/${network}/")
if [ -d "${test_path}" ]; then
group1+=(--exclude "${test_path}")
group2+=("${test_path}")
fi
done done
case "${group}" in case "${group}" in
1) options=("${group1[@]}") ;; 1) options=("${group1[@]:+${group1[@]}}") ;;
2) options=("${group2[@]}") ;; 2) options=("${group2[@]:+${group2[@]}}") ;;
esac esac
if [ ${#options[@]} -eq 0 ] && [ "${group}" -eq 2 ]; then
# allow collection migration unit tests for group 2 to "pass" without updating shippable.yml or this script during migration
echo "No unit tests found for group ${group}."
exit
fi
ansible-test env --timeout "${timeout}" --color -v ansible-test env --timeout "${timeout}" --color -v
# shellcheck disable=SC2086 # shellcheck disable=SC2086
ansible-test units --color -v --docker default --python "${version}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} \ ansible-test units --color -v --docker default --python "${version}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} \
"${options[@]}" \ "${options[@]:+${options[@]}}" \