diff options
| author | James Cammarata <jimi@sngx.net> | 2016-03-22 15:37:47 -0400 |
|---|---|---|
| committer | James Cammarata <jimi@sngx.net> | 2016-03-22 15:37:47 -0400 |
| commit | 6afed7083a99d14ec80a065cfde8ca1b1ce1efb2 (patch) | |
| tree | 6361c964a74d33b815b91b372aef4b1b0f18b2eb | |
| parent | 43f70d66a5c1917e0ccd71ae1c566d6622f1abeb (diff) | |
| download | ansible-6afed7083a99d14ec80a065cfde8ca1b1ce1efb2.tar.gz | |
Revert "Use docker cp instead of docker volumes to allow for testing with remote docker servers"
This reverts commit 18599047cd4a46260b05215e7f3c561c335fc1c7.
| -rwxr-xr-x | test/utils/run_tests.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/test/utils/run_tests.sh b/test/utils/run_tests.sh index b7bd5c3e28..bdfb392ff3 100755 --- a/test/utils/run_tests.sh +++ b/test/utils/run_tests.sh @@ -11,8 +11,7 @@ else set -e export C_NAME="testAbull_$$_$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 8 | head -n 1)" docker pull ansible/ansible:${TARGET} - docker run -d --name "${C_NAME}" ${TARGET_OPTIONS} ansible/ansible:${TARGET} > /tmp/cid_${TARGET} - docker cp ${PWD} $(cat /tmp/cid_${TARGET}):/root/ansible + docker run -d --volume="${PWD}:/root/ansible:Z" --name "${C_NAME}" ${TARGET_OPTIONS} ansible/ansible:${TARGET} > /tmp/cid_${TARGET} docker exec -ti $(cat /tmp/cid_${TARGET}) /bin/sh -c "export TEST_FLAGS='${TEST_FLAGS}'; cd /root/ansible; . hacking/env-setup; (cd test/integration; LC_ALL=en_US.utf-8 make)" docker kill $(cat /tmp/cid_${TARGET}) |