x/sahara-ci-config
Code Issues Proposed changes

Check tests exit status from log

Browse Source 
This is necessary because sometimes exit code from tox
tests is 0, instead 1.

Change-Id: I8f226643f888ae0a045ad71b492323b3a1903bca
This commit is contained in:
Denis Egorenko 2015-03-11 13:30:11 +04:00
parent c9e8ee829b
commit 11f022554c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
slave-scripts/functions.sh
View File

@ -277,8 +277,8 @@ run_tests() {
;;
vanilla2)
if [[ "$JOB_NAME" =~ scenario ]]; then
tox -e scenario $TESTS_CONFIG_FILE
STATUS=$?
tox -e scenario $TESTS_CONFIG_FILE | tee tox.log
STATUS=$(grep "\ -\ Failed" tox.log | awk -F ':' '{print $2}')
else
tox -e integration -- vanilla2 --concurrency=1
STATUS=$?
@ -294,8 +294,8 @@ run_tests() {
;;
spark)
if [[ "$JOB_NAME" =~ scenario ]]; then
tox -e scenario $TESTS_CONFIG_FILE
STATUS=$?
tox -e scenario $TESTS_CONFIG_FILE | tee tox.log
STATUS=$(grep "\ -\ Failed" tox.log | awk -F ':' '{print $2}')
else
tox -e integration -- spark --concurrency=1
STATUS=$?

4
slave-scripts/tempest.sh
View File

@ -60,8 +60,8 @@ sudo pip install $SAHARA_PATH/.
write_sahara_main_conf $SAHARA_PATH/etc/sahara/sahara.conf
start_sahara $SAHARA_PATH/etc/sahara/sahara.conf
STATUS=0
tox -e all -- tempest.scenario.data_processing.client_tests || STATUS=1
tox -e all -- tempest.scenario.data_processing.client_tests | tee tox.log
STATUS=$(grep "\ -\ Failed" tox.log | awk -F ':' '{print $2}')
mv logs $WORKSPACE
print_python_env $WORKSPACE