Merge "fix integration test screen shots"

tools/gate/integration/commons

@@ -2,4 +2,4 @@
 
 set -ex
 
-export SAHARA_DASHBOARD_SCREENSHOTS_DIR=sahara_dashboard/test/integration_tests/integration_tests_screenshots
+export SAHARA_DASHBOARD_SCREENSHOTS_DIR=/opt/stack/new/sahara-dashboard/.tox/py27integration/src/horizon/openstack_dashboard/test/integration_tests/integration_tests_screenshots

tools/gate/integration/post_test_hook.sh

@@ -2,12 +2,15 @@
 
 # This script will be executed inside post_test_hook function in devstack gate
 
-set -ex
+set -x
 source commons $@
 
+set +e
 cd /opt/stack/new/sahara-dashboard
 sudo -H -u stack tox -e py27integration
 retval=$?
+set -e
+
 if [ -d ${SAHARA_DASHBOARD_SCREENSHOTS_DIR}/ ]; then
   cp -r ${SAHARA_DASHBOARD_SCREENSHOTS_DIR}/ /home/jenkins/workspace/gate-sahara-dashboard-dsvm-integration/
 fi

tox.ini

@@ -10,6 +10,7 @@ setenv =
    VIRTUAL_ENV={envdir}
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
+whitelist_externals = /bin/bash
 commands = /bin/bash run_tests.sh -N --no-pep8 {posargs}
 
 [testenv:py27]