From 228cb344716e6d153eb0dfb43db83af1088d458f Mon Sep 17 00:00:00 2001
From: chenjiankun <chenjiankun1@huawei.com>
Date: Mon, 11 Sep 2017 01:26:25 +0000
Subject: Bugfix: cleanup command not found
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 | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tests/ci/yardstick-verify b/tests/ci/yardstick-verify
index ca8a0b27a..f3e7a49e3 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"
--
cgit