| ... | ... |
@@ -13,6 +13,13 @@ else |
| 13 | 13 |
target="shippable/posix/" |
| 14 | 14 |
fi |
| 15 | 15 |
|
| 16 |
+# detect the post migration ansible/ansible repo and enable test support plugins |
|
| 17 |
+if [ -f lib/ansible/config/routing.yml ]; then |
|
| 18 |
+ # this option is only useful for ansible/ansible (not collections) and should not be used prior to migration (except for incidental tests) |
|
| 19 |
+ enable_test_support=--enable-test-support |
|
| 20 |
+fi |
|
| 21 |
+ |
|
| 16 | 22 |
# shellcheck disable=SC2086 |
| 17 | 23 |
ansible-test integration --color -v --retry-on-error "${target}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} ${UNSTABLE:+"$UNSTABLE"} \
|
| 24 |
+ ${enable_test_support:+"$enable_test_support"} \
|
|
| 18 | 25 |
--docker "${image}"
|
| ... | ... |
@@ -17,6 +17,13 @@ fi |
| 17 | 17 |
stage="${S:-prod}"
|
| 18 | 18 |
provider="${P:-default}"
|
| 19 | 19 |
|
| 20 |
+# detect the post migration ansible/ansible repo and enable test support plugins |
|
| 21 |
+if [ -f lib/ansible/config/routing.yml ]; then |
|
| 22 |
+ # this option is only useful for ansible/ansible (not collections) and should not be used prior to migration (except for incidental tests) |
|
| 23 |
+ enable_test_support=--enable-test-support |
|
| 24 |
+fi |
|
| 25 |
+ |
|
| 20 | 26 |
# shellcheck disable=SC2086 |
| 21 | 27 |
ansible-test integration --color -v --retry-on-error "${target}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} ${UNSTABLE:+"$UNSTABLE"} \
|
| 28 |
+ ${enable_test_support:+"$enable_test_support"} \
|
|
| 22 | 29 |
--remote "${platform}/${version}" --remote-terminate always --remote-stage "${stage}" --remote-provider "${provider}"
|
| ... | ... |
@@ -13,6 +13,12 @@ target="shippable/windows/group${group}/"
|
| 13 | 13 |
stage="${S:-prod}"
|
| 14 | 14 |
provider="${P:-default}"
|
| 15 | 15 |
|
| 16 |
+# detect the post migration ansible/ansible repo and enable test support plugins |
|
| 17 |
+if [ -f lib/ansible/config/routing.yml ]; then |
|
| 18 |
+ # this option is only useful for ansible/ansible (not collections) and should not be used prior to migration (except for incidental tests) |
|
| 19 |
+ enable_test_support=--enable-test-support |
|
| 20 |
+fi |
|
| 21 |
+ |
|
| 16 | 22 |
# python versions to test in order |
| 17 | 23 |
# python 2.7 runs full tests while other versions run minimal tests |
| 18 | 24 |
python_versions=( |
| ... | ... |
@@ -93,5 +99,6 @@ for version in "${python_versions[@]}"; do
|
| 93 | 93 |
ansible-test windows-integration --color -v --retry-on-error "${ci}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} ${UNSTABLE:+"$UNSTABLE"} \
|
| 94 | 94 |
"${platforms[@]}" --changed-all-target "${changed_all_target}" --changed-all-mode "${changed_all_mode}" \
|
| 95 | 95 |
--docker default --python "${version}" \
|
| 96 |
+ ${enable_test_support:+"$enable_test_support"} \
|
|
| 96 | 97 |
--remote-terminate "${terminate}" --remote-stage "${stage}" --remote-provider "${provider}"
|
| 97 | 98 |
done |