Bugfix: cleanup command not found 91/41491/1
authorchenjiankun <chenjiankun1@huawei.com>
Mon, 11 Sep 2017 01:26:25 +0000 (01:26 +0000)
committerchenjiankun <chenjiankun1@huawei.com>
Mon, 11 Sep 2017 01:26:25 +0000 (01:26 +0000)
JIRA: YARDSTICK-808

This bug is from CI, see log:
https://build.opnfv.org/ci/view/yardstick/job/yardstick-joid-baremetal-daily-master/1560/consoleFull

The reason is we don not have cleanup function in the script.
It is in another script clean_image.sh.
so I remove it, and call clean_image.sh when in openstack scenario.

Change-Id: I844cd9e8f0b6e1e8ff7a6094be37789d35a2c345
Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
tests/ci/yardstick-verify

index ca8a0b2..f3e7a49 100755 (executable)
@@ -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"