diff options
| author | Matt Clay <matt@mystile.com> | 2020-02-07 21:31:22 +0100 |
|---|---|---|
| committer | Matt Clay <matt@mystile.com> | 2020-02-08 06:29:39 +0100 |
| commit | 80561ccef0759682cf5bcd810d76fccbb508dfdc (patch) | |
| tree | f2ba6c2b221dabdae3b206a46c4cc3ac374d1ba0 /test/utils | |
| parent | Split handler tasks for setup_remote_tmp_dir. (diff) | |
| download | ansible-80561ccef0759682cf5bcd810d76fccbb508dfdc.tar.xz ansible-80561ccef0759682cf5bcd810d76fccbb508dfdc.zip | |
Improve sanity test handling in CI after migration.
Diffstat (limited to 'test/utils')
| -rwxr-xr-x | test/utils/shippable/sanity.sh | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/test/utils/shippable/sanity.sh b/test/utils/shippable/sanity.sh index d44970be95..72cd83abea 100755 --- a/test/utils/shippable/sanity.sh +++ b/test/utils/shippable/sanity.sh @@ -16,11 +16,22 @@ fi case "${group}" in 1) options=(--skip-test pylint --skip-test ansible-doc --skip-test docs-build --skip-test package-data --skip-test validate-modules) ;; 2) options=( --test ansible-doc --test docs-build --test package-data) ;; - 3) options=(--test pylint --exclude test/units/ --exclude lib/ansible/module_utils/ --exclude lib/ansible/modules/network/) ;; - 4) options=(--test pylint test/units/ lib/ansible/module_utils/ lib/ansible/modules/network/) ;; + 3) options=(--test pylint --exclude test/units/ --exclude lib/ansible/module_utils/) ;; + 4) options=(--test pylint test/units/ lib/ansible/module_utils/) ;; 5) options=( --test validate-modules) ;; esac +# allow collection migration sanity tests for groups 3 and 4 to pass without updating this script during migration +network_path="lib/ansible/modules/network/" + +if [ -d "${network_path}" ]; then + if [ "${group}" -eq 3 ]; then + options+=(--exclude "${network_path}") + elif [ "${group}" -eq 4 ]; then + options+=("${network_path}") + fi +fi + # shellcheck disable=SC2086 ansible-test sanity --color -v --junit ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} \ --docker --docker-keep-git --base-branch "${base_branch}" \ |