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.

5 files changed, 17 insertions, 28 deletions

diff --git a/test/utils/shippable/cloud.sh b/test/utils/shippable/cloud.sh
index 9782bd7ce0..83e02920e5 100755
--- a/test/utils/shippable/cloud.sh
+++ b/test/utils/shippable/cloud.sh
@@ -6,8 +6,9 @@ declare -a args
 IFS='/:' read -ra args <<< "$1"
 
 image="${args[1]}"
-target="posix/ci/cloud/group${args[2]}/"
+python="${args[2]}"
+target="posix/ci/cloud/group${args[3]}/"
 
 # shellcheck disable=SC2086
 ansible-test integration --color -v --retry-on-error "${target}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} \
-    --docker "${image}" --changed-all-target "${target}smoketest/"
+    --docker "${image}" --python "${python}" --changed-all-target "${target}smoketest/"
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
diff --git a/test/utils/shippable/other.sh b/test/utils/shippable/other.sh
index 0392538f71..bc93895f07 100755
--- a/test/utils/shippable/other.sh
+++ b/test/utils/shippable/other.sh
@@ -4,20 +4,17 @@ set -o pipefail
 
 shippable.py
 
-retry.py apt-get update -qq
-retry.py apt-get install -qq \
-    shellcheck \
-
-retry.py pip install tox --disable-pip-version-check
-
 echo '{"verified": false, "results": []}' > test/results/bot/ansible-test-failure.json
 
+if [ "${BASE_BRANCH:-}" ]; then
+    base_branch="origin/${BASE_BRANCH}"
+else
+    base_branch=""
+fi
 # shellcheck disable=SC2086
-ansible-test compile --failure-ok --color -v --junit --requirements --coverage ${CHANGED:+"$CHANGED"}
-# shellcheck disable=SC2086
-ansible-test sanity  --failure-ok --color -v --junit --tox --skip-test ansible-doc --skip-test import --python 3.5 --coverage ${CHANGED:+"$CHANGED"}
+ansible-test compile --failure-ok --color -v --junit --coverage ${CHANGED:+"$CHANGED"} --docker default
 # shellcheck disable=SC2086
-ansible-test sanity  --failure-ok --color -v --junit --tox --test      ansible-doc --test      import              --coverage ${CHANGED:+"$CHANGED"}
+ansible-test sanity  --failure-ok --color -v --junit --coverage ${CHANGED:+"$CHANGED"} --docker default --docker-keep-git --base-branch "${base_branch}"
 
 rm test/results/bot/ansible-test-failure.json
 
diff --git a/test/utils/shippable/units.sh b/test/utils/shippable/units.sh
index a099c7a464..b3d2f17282 100755
--- a/test/utils/shippable/units.sh
+++ b/test/utils/shippable/units.sh
@@ -7,7 +7,5 @@ IFS='/:' read -ra args <<< "$1"
 
 version="${args[1]}"
 
-retry.py pip install tox --disable-pip-version-check
-
 # shellcheck disable=SC2086
-ansible-test units --color -v --tox --python "${version}" --coverage ${CHANGED:+"$CHANGED"} \
+ansible-test units --color -v --docker default --python "${version}" --coverage ${CHANGED:+"$CHANGED"} \
diff --git a/test/utils/shippable/windows.sh b/test/utils/shippable/windows.sh
index c2189c17c4..0aa99ee3d7 100755
--- a/test/utils/shippable/windows.sh
+++ b/test/utils/shippable/windows.sh
@@ -40,12 +40,7 @@ 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}/
-
     changed_all_target="all"
 
     if [ "${version}" == "2.7" ]; then
@@ -73,6 +68,6 @@ for version in "${python_versions[@]}"; do
     fi
 
     # shellcheck disable=SC2086
-    ansible-test windows-integration --color -v --retry-on-error "${ci}" --tox --python "${version}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} \
+    ansible-test windows-integration --color -v --retry-on-error "${ci}" --docker default --python "${version}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} \
         "${platforms[@]}" --changed-all-target "${changed_all_target}"
 done