summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.azure-pipelines/azure-pipelines.yml6
-rwxr-xr-xtest/utils/shippable/incidental/network.sh6
2 files changed, 4 insertions, 8 deletions
diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
index c8bcca6b57..a08046321a 100644
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@@ -227,10 +227,8 @@ stages:
targets:
- name: IOS Python
test: ios/csr1000v/
- - name: VyOS Python 2.7
- test: vyos/1.1.8/2.7
- - name: VyOS Python 3.6
- test: vyos/1.1.8/3.6
+ - name: VyOS Python
+ test: vyos/1.1.8/
- name: AWS Python 2.7
test: aws/2.7
- name: AWS Python 3.6
diff --git a/test/utils/shippable/incidental/network.sh b/test/utils/shippable/incidental/network.sh
index 8ca8026233..4575476a92 100755
--- a/test/utils/shippable/incidental/network.sh
+++ b/test/utils/shippable/incidental/network.sh
@@ -16,10 +16,8 @@ provider="${P:-default}"
# python versions to test in order
# all versions run full tests
-python_versions=(
- 2.7
- 3.6
-)
+IFS=' ' read -r -a python_versions <<< \
+ "$(PYTHONPATH="${PWD}/test/lib" python -c 'from ansible_test._internal import util; print(" ".join(util.CONTROLLER_PYTHON_VERSIONS))')"
if [ "${python_version}" ]; then
# limit tests to a single python version