From bdffb5997829444603af9ad677cf48a3aefd3ed0 Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Mon, 10 May 2021 15:06:09 -0700 Subject: [PATCH] Update Python versions used to run network tests. (#74647) --- .azure-pipelines/azure-pipelines.yml | 6 ++---- test/utils/shippable/incidental/network.sh | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index c8bcca6b574..a08046321a1 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 8ca80262335..4575476a92f 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