1 files changed, 5 insertions, 3 deletions
diff --git a/tests/ci/yardstick-verify b/tests/ci/yardstick-verify
index ca8a0b27a..d1174825f 100755
--- a/tests/ci/yardstick-verify
+++ b/tests/ci/yardstick-verify
@@ -87,7 +87,9 @@ error_exit()
         exitcode=$rc
     fi
 
-    cleanup
+    if [[ "${DEPLOY_SCENARIO:0:2}" == 'os' ]];then
+        source "${YARDSTICK_REPO_DIR}/tests/ci/clean_images.sh"
+    fi
 
     echo "Exiting with RC=$exitcode"
 
@@ -207,10 +209,10 @@ EOF
 
 
 
-        local scenario_status="SUCCESS"
+        local scenario_status="PASS"
 
         if [ $failed -gt 0 ]; then
-            scenario_status="FAILED"
+            scenario_status="FAIL"
         fi
 
         report "${scenario_status}" "${start_date}" "${stop_date}"