diff options
| author | James Cammarata <jimi@sngx.net> | 2016-03-23 12:42:15 -0400 |
|---|---|---|
| committer | James Cammarata <jimi@sngx.net> | 2016-03-23 12:42:15 -0400 |
| commit | c1c6142f4b4e5adde1baf19738c3fbe530799ab7 (patch) | |
| tree | f655ecb57fc7c5b008f2415259ef01e086f7c2f3 | |
| parent | fdc4cc4c4e3ef13a771eb65260462e852286cec7 (diff) | |
| download | ansible-c1c6142f4b4e5adde1baf19738c3fbe530799ab7.tar.gz | |
Updating run_tests.sh from devel
| -rwxr-xr-x | test/utils/run_tests.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/utils/run_tests.sh b/test/utils/run_tests.sh index eef7f1f60e..214b1c827c 100755 --- a/test/utils/run_tests.sh +++ b/test/utils/run_tests.sh @@ -1,5 +1,7 @@ #!/bin/sh -x +set -e + if [ "${TARGET}" = "sanity" ]; then ./test/code-smell/replace-urlopen.sh . ./test/code-smell/use-compat-six.sh lib @@ -8,13 +10,13 @@ if [ "${TARGET}" = "sanity" ]; then if test x"$TOXENV" != x'py24' ; then tox ; fi if test x"$TOXENV" = x'py24' ; then python2.4 -V && python2.4 -m compileall -fq -x 'module_utils/(a10|rax|openstack|ec2|gce).py' lib/ansible/module_utils ; fi 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 --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}) if [ "X${TESTS_KEEP_CONTAINER}" = "X" ]; then - docker rm "${C_NAME}" + docker rm -vf "${C_NAME}" fi fi |