diff options
author | Matt Clay <mclay@redhat.com> | 2020-03-09 11:08:55 -0700 |
---|---|---|
committer | Matt Martz <matt@sivel.net> | 2020-03-23 11:14:21 -0500 |
commit | 4cecacb9155c3c4161d25ad346b31ac2b5d34c56 (patch) | |
tree | 01630363b2e8db2ef27cf9108caf69258a19c577 /test/utils | |
parent | 930d89dd5e178ecc92f9cd9040ee643748f96350 (diff) | |
download | ansible-4cecacb9155c3c4161d25ad346b31ac2b5d34c56.tar.gz |
Update Shippable test matrix. (#68117)
* Update Shippable test matrix.
* Remove unit test groups.
* Remove extra windows groups.
Diffstat (limited to 'test/utils')
-rwxr-xr-x | test/utils/shippable/units.sh | 99 | ||||
-rwxr-xr-x | test/utils/shippable/windows.sh | 6 |
2 files changed, 0 insertions, 105 deletions
diff --git a/test/utils/shippable/units.sh b/test/utils/shippable/units.sh index e2ff963f19..dc115dec15 100755 --- a/test/utils/shippable/units.sh +++ b/test/utils/shippable/units.sh @@ -6,105 +6,6 @@ declare -a args IFS='/:' read -ra args <<< "$1" version="${args[1]}" -group="${args[2]}" - -if [[ "${COVERAGE:-}" == "--coverage" ]]; then - timeout=90 -else - timeout=30 -fi - -group1=() -group2=() -group3=() - -# create three groups by putting network tests into separate groups -# add or remove network platforms as needed to balance the groups - -networks2=( - aireos - apconos - aruba - asa - avi - check_point - cloudengine - cloudvision - cnos - cumulus - dellos10 - dellos6 - dellos9 - edgeos - edgeswitch - enos - eos - eric_eccli - exos - f5 - fortimanager - frr - ftd - icx - ingate - ios - iosxr - ironware - itential - junos - netact - netscaler - netvisor - nos - nso - nuage - nxos - onyx - opx - ovs - radware - routeros - slxos - voss - vyos -) - -networks3=( - fortios -) - -for network in "${networks2[@]}"; do - test_path="test/units/modules/network/${network}/" - - if [ -d "${test_path}" ]; then - group1+=(--exclude "${test_path}") - group2+=("${test_path}") - fi -done - -for network in "${networks3[@]}"; do - test_path="test/units/modules/network/${network}/" - - if [ -d "${test_path}" ]; then - group1+=(--exclude "${test_path}") - group3+=("${test_path}") - fi -done - -case "${group}" in - 1) options=("${group1[@]:+${group1[@]}}") ;; - 2) options=("${group2[@]:+${group2[@]}}") ;; - 3) options=("${group3[@]:+${group3[@]}}") ;; -esac - -if [ ${#options[@]} -eq 0 ] && [ "${group}" -gt 1 ]; then - # allow collection migration unit tests for groups other than 1 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 # shellcheck disable=SC2086 ansible-test units --color -v --docker default --python "${version}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} \ - "${options[@]:+${options[@]}}" \ diff --git a/test/utils/shippable/windows.sh b/test/utils/shippable/windows.sh index f349057f75..b4459a1381 100755 --- a/test/utils/shippable/windows.sh +++ b/test/utils/shippable/windows.sh @@ -17,12 +17,6 @@ provider="${P:-default}" if [ -f lib/ansible/config/routing.yml ]; then # this option is only useful for ansible/ansible (not collections) and should not be used prior to migration (except for incidental tests) enable_test_support=--enable-test-support - - if ! ansible-test windows-integration "${target}" --list-targets > /dev/null 2>&1; then - # allow tests to pass when windows groups do not exist after migration, making preparation for migration easier - echo "Nothing to do since there are no tests after migration for: ${target}" - exit - fi fi # python versions to test in order |