Correct virtualenv usage in integration tests.

1 files changed, 11 insertions, 28 deletions

diff --git a/test/integration/targets/ecs_cluster/runme.sh b/test/integration/targets/ecs_cluster/runme.sh
index 0d1e0f18bf..3dd6bf10c0 100755
--- a/test/integration/targets/ecs_cluster/runme.sh
+++ b/test/integration/targets/ecs_cluster/runme.sh
@@ -1,48 +1,31 @@
 #!/usr/bin/env bash
 
-# We don't set -u here, due to pypa/virtualenv#150
-set -ex
-
-MYTMPDIR=$(mktemp -d 2>/dev/null || mktemp -d -t 'mytmpdir')
-
-trap 'rm -rf "${MYTMPDIR}"' EXIT
-
-# This is needed for the ubuntu1604py3 tests
-# Ubuntu patches virtualenv to make the default python2
-# but for the python3 tests we need virtualenv to use python3
-PYTHON=${ANSIBLE_TEST_PYTHON_INTERPRETER:-python}
-
-
+set -eux
 
 # Test graceful failure for older versions of botocore
-virtualenv --system-site-packages --python "${PYTHON}" "${MYTMPDIR}/botocore-1.7.40"
-source "${MYTMPDIR}/botocore-1.7.40/bin/activate"
-$PYTHON -m pip install 'botocore<=1.7.40' boto3
+source virtualenv.sh
+pip install 'botocore<=1.7.40' boto3
 ansible-playbook -i ../../inventory -e @../../integration_config.yml -v playbooks/network_fail.yml "$@"
 
 # Test graceful failure for assign public ip
 # applies for botocore >= 1.7.44 and < 1.8.4
-virtualenv --system-site-packages --python "${PYTHON}" "${MYTMPDIR}/botocore-1.7.44"
-source "${MYTMPDIR}/botocore-1.7.44/bin/activate"
-$PYTHON -m pip install 'botocore>=1.7.44,<1.8.4' boto3
+source virtualenv.sh
+pip install 'botocore>=1.7.44,<1.8.4' boto3
 ansible-playbook -i ../../inventory -e @../../integration_config.yml -v playbooks/network_assign_public_ip_fail.yml "$@"
 
 # Test graceful failure for force new deployment #42518
 # applies for botocore < 1.8.4
-virtualenv --system-site-packages --python "${PYTHON}" "${MYTMPDIR}/botocore-1.8.4"
-source "${MYTMPDIR}/botocore-1.8.4/bin/activate"
-$PYTHON -m pip install 'botocore>=1.7.44,<1.8.4' boto3
+source virtualenv.sh
+pip install 'botocore>=1.7.44,<1.8.4' boto3
 ansible-playbook -i ../../inventory -e @../../integration_config.yml -v playbooks/network_force_new_deployment_fail.yml "$@"
 
 # Test force new deployment #42518
 # applies for botocore < 1.8.4
-virtualenv --system-site-packages --python "${PYTHON}" "${MYTMPDIR}/botocore-1.8.5"
-source "${MYTMPDIR}/botocore-1.8.5/bin/activate"
-$PYTHON -m pip install 'botocore>1.8.4' boto3
+source virtualenv.sh
+pip install 'botocore>1.8.4' boto3
 ansible-playbook -i ../../inventory -e @../../integration_config.yml -v playbooks/network_force_new_deployment.yml "$@"
 
 # Run full test suite
-virtualenv --system-site-packages --python "${PYTHON}" "${MYTMPDIR}/botocore-recent"
-source "${MYTMPDIR}/botocore-recent/bin/activate"
-$PYTHON -m pip install 'botocore>=1.10.37' boto3 # version 1.10.37 for scheduling strategy
+source virtualenv.sh
+pip install 'botocore>=1.10.37' boto3 # version 1.10.37 for scheduling strategy
 ansible-playbook -i ../../inventory -e @../../integration_config.yml -v playbooks/full_test.yml "$@"