Ensure that any command in run_tests.sh that fails results in immediate failure

pull/15105/head
Matt Martz 9 years ago
parent bb6e05a176
commit a6d52ce098

@ -1,5 +1,7 @@
#!/bin/sh -x #!/bin/sh -x
set -e
if [ "${TARGET}" = "sanity" ]; then if [ "${TARGET}" = "sanity" ]; then
./test/code-smell/replace-urlopen.sh . ./test/code-smell/replace-urlopen.sh .
./test/code-smell/use-compat-six.sh lib ./test/code-smell/use-compat-six.sh lib
@ -8,7 +10,6 @@ if [ "${TARGET}" = "sanity" ]; then
if test x"$TOXENV" != x'py24' ; then tox ; fi 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 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 else
set -e
export C_NAME="testAbull_$$_$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 8 | head -n 1)" 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 pull ansible/ansible:${TARGET}
docker run -d --volume="${PWD}:/root/ansible:Z" --name "${C_NAME}" ${TARGET_OPTIONS} ansible/ansible:${TARGET} > /tmp/cid_${TARGET} docker run -d --volume="${PWD}:/root/ansible:Z" --name "${C_NAME}" ${TARGET_OPTIONS} ansible/ansible:${TARGET} > /tmp/cid_${TARGET}

Loading…
Cancel
Save