diff options
| author | Sergey Reshetnyak <sreshetniak@mirantis.com> | 2015-10-05 14:06:47 +0300 |
|---|---|---|
| committer | Sergey Reshetnyak <sreshetniak@mirantis.com> | 2015-10-05 19:23:52 +0300 |
| commit | 2a7601f8c2a9f2946b3c7f5b6e5cec5fc0be49e9 (patch) | |
| tree | 052fb95968366651fbdaf979f5ec389b09db4e56 /saharaclient | |
| parent | 1506e941062759fdc90d299a9ec26f751b38abaf (diff) | |
| download | python-saharaclient-2a7601f8c2a9f2946b3c7f5b6e5cec5fc0be49e9.tar.gz | |
Fix functional tests in gate
Change-Id: I7444568302935fb0c844994767f1acd5a9fafd3b
Diffstat (limited to 'saharaclient')
| -rwxr-xr-x | saharaclient/tests/functional/hooks/post_test_hook.sh | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/saharaclient/tests/functional/hooks/post_test_hook.sh b/saharaclient/tests/functional/hooks/post_test_hook.sh index 88df438..23b7f5e 100755 --- a/saharaclient/tests/functional/hooks/post_test_hook.sh +++ b/saharaclient/tests/functional/hooks/post_test_hook.sh @@ -14,18 +14,6 @@ # This script is executed inside post_test_hook function in devstack gate. -function generate_testr_results { - if [ -f .testrepository/0 ]; then - sudo .tox/functional/bin/testr last --subunit > $WORKSPACE/testrepository.subunit - sudo mv $WORKSPACE/testrepository.subunit $BASE/logs/testrepository.subunit - sudo /usr/os-testr-env/bin/subunit2html $BASE/logs/testrepository.subunit $BASE/logs/testr_results.html - sudo gzip -9 $BASE/logs/testrepository.subunit - sudo gzip -9 $BASE/logs/testr_results.html - sudo chown jenkins:jenkins $BASE/logs/testrepository.subunit.gz $BASE/logs/testr_results.html.gz - sudo chmod a+r $BASE/logs/testrepository.subunit.gz $BASE/logs/testr_results.html.gz - fi -} - export SAHARACLIENT_DIR="$BASE/new/python-saharaclient" # Get admin credentials @@ -39,12 +27,5 @@ sudo chown -R jenkins:stack $SAHARACLIENT_DIR # Run tests echo "Running saharaclient functional test suite" -set +e # Preserve env for OS_ credentials -sudo -E -H -u jenkins tox -efunctional -EXIT_CODE=$? -set -e - -# Collect and parse result -generate_testr_results -exit $EXIT_CODE +sudo -E -H -u jenkins /usr/local/jenkins/slave_scripts/run-tox.sh functional |