From a6f4e23d26b7e7e054ad29ea572a0f23f83083a5 Mon Sep 17 00:00:00 2001 From: Goutham Pacha Ravi Date: Tue, 15 May 2018 10:36:08 -0700 Subject: [PATCH] Fix post-execution for tempest tests Manila's post_test_hook runs tempest after populating tempest.conf with the requisite options, the results from tempest are saved prior to performing some post tasks, including deciding to run tests again with a different configuration if necessary (Ex: manila-tempest-minimal-dsvm-dummy). The result is then replayed at the end of the gate job so it can be reported to gerrit as a SUCCESS or a FAILURE. Fix the mis-aligned command that saves the test execution status to replay later. Change-Id: I1578760697aeae6e20bf567c60fbcdee0a642bee Closes-Bug: 1770183 (cherry picked from commit a0947ab42d9f37236c1f0784bd39346b04f8b6a8) --- contrib/ci/post_test_hook.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/ci/post_test_hook.sh b/contrib/ci/post_test_hook.sh index 3abf416de3..069438e9ef 100755 --- a/contrib/ci/post_test_hook.sh +++ b/contrib/ci/post_test_hook.sh @@ -358,8 +358,8 @@ fi echo "Running tempest manila test suites" cd $BASE/new/tempest/ sudo -H -u $USER tempest run -r $MANILA_TESTS --concurrency=$MANILA_TEMPEST_CONCURRENCY -cd - RETVAL=$? +cd - # If using the dummy driver, configure the second run. We can't use the @@ -382,8 +382,8 @@ if [[ "$DRIVER" == "dummy" ]]; then echo "Running tempest manila test suites for DHSS=False mode" cd $BASE/new/tempest/ sudo -H -u $USER tempest run -r $MANILA_TESTS --concurrency=$MANILA_TEMPEST_CONCURRENCY - cd - RETVAL2=$? + cd - save_tempest_results 2 # Exit with last code if first succeeded else exit with first error code