summaryrefslogtreecommitdiff
path: root/test/utils/shippable/network.sh
diff options
context:
space:
mode:
authorMatt Clay <matt@mystile.com>2017-10-26 00:21:46 -0700
committerGitHub <noreply@github.com>2017-10-26 00:21:46 -0700
commitcf1337ca9a6368691150dcd44eb8e4e52e8d69b6 (patch)
tree2d85bacb33d1911b73eff3a84e6d1bae4f8ea398 /test/utils/shippable/network.sh
parent602a618e6056791c34bda606dd4a0f1e215a4b53 (diff)
downloadansible-cf1337ca9a6368691150dcd44eb8e4e52e8d69b6.tar.gz
Update ansible-test sanity command. (#31958)
* Use correct pip version in ansible-test. * Add git fallback for validate-modules. * Run sanity tests in a docker container. * Use correct python version for sanity tests. * Pin docker completion images and add default. * Split pylint execution into multiple contexts. * Only test .py files in use-argspec-type-path test. * Accept identical python interpeter name or binary. * Switch cloud tests to default container. * Remove unused extras from pip install. * Filter out empty pip commands. * Don't force running of pip list. * Support delegation for windows and network tests. * Fix ansible-test python version usage. * Fix ansible-test python version skipping. * Use absolute path for log in ansible-test. * Run vyos_command test on python 3. * Fix windows/network instance persistence. * Add `test/cache` dir to classification. * Enable more python versions for network tests. * Fix cs_router test.
Diffstat (limited to 'test/utils/shippable/network.sh')
-rwxr-xr-xtest/utils/shippable/network.sh12
1 files changed, 5 insertions, 7 deletions
diff --git a/test/utils/shippable/network.sh b/test/utils/shippable/network.sh
index f0e1905ae6..079a01df5b 100755
--- a/test/utils/shippable/network.sh
+++ b/test/utils/shippable/network.sh
@@ -15,7 +15,10 @@ target="network/ci/"
# python versions to test in order
# all versions run full tests
python_versions=(
+ 2.6
2.7
+ 3.5
+ 3.6
)
if [ -s /tmp/network.txt ]; then
@@ -37,13 +40,8 @@ else
)
fi
-retry.py pip install tox --disable-pip-version-check
-
for version in "${python_versions[@]}"; do
- # clean up between test runs until we switch from --tox to --docker
- rm -rf ~/.ansible/{cp,pc,tmp}/
-
# shellcheck disable=SC2086
- ansible-test network-integration --color -v --retry-on-error "${target}" --tox --python "${version}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} \
- "${platforms[@]}"
+ ansible-test network-integration --color -v --retry-on-error "${target}" --docker default --python "${version}" \
+ ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} "${platforms[@]}"
done