diff options
| author |   Jing Lu <lvjing5@huawei.com> | 2016-12-24 01:21:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-12-24 01:21:36 +0000 |
| commit | bd847993c084f2d29de099c4b0e33a3d2e8de03e (patch) | |
| tree | 42e703fcaf1b439669daf830e649052562d57113 /tests | |
| parent | 734a4d10e3d3efc0ed869771be56b3cbd9df7602 (diff) | |
| parent | e88d02c9d87c18dbaaf849d8b10167e6dadf485a (diff) | |
Merge "Bugfix: the load_image.sh script will load a image with the same name"
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/ci/clean_images.sh | 7 | ||||
| -rwxr-xr-x | tests/ci/yardstick-verify | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/tests/ci/clean_images.sh b/tests/ci/clean_images.sh index 5d661283d..fa4a54df6 100755 --- a/tests/ci/clean_images.sh +++ b/tests/ci/clean_images.sh @@ -27,3 +27,10 @@ cleanup() openstack flavor delete yardstick-flavor &> /dev/null || true } + +main() +{ + cleanup +} + +main diff --git a/tests/ci/yardstick-verify b/tests/ci/yardstick-verify index 46b32cc2c..f9d98a4da 100755 --- a/tests/ci/yardstick-verify +++ b/tests/ci/yardstick-verify @@ -320,8 +320,6 @@ main() source $YARDSTICK_REPO_DIR/tests/ci/clean_images.sh - cleanup - trap "error_exit" EXIT SIGTERM source $YARDSTICK_REPO_DIR/tests/ci/load_images.sh |