summaryrefslogtreecommitdiffstats
path: root/tests/ci
diff options
context:
space:
mode:
authorJing Lu <lvjing5@huawei.com>2016-12-24 01:21:36 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-12-24 01:21:36 +0000
commitbd847993c084f2d29de099c4b0e33a3d2e8de03e (patch)
tree42e703fcaf1b439669daf830e649052562d57113 /tests/ci
parent734a4d10e3d3efc0ed869771be56b3cbd9df7602 (diff)
parente88d02c9d87c18dbaaf849d8b10167e6dadf485a (diff)
Merge "Bugfix: the load_image.sh script will load a image with the same name"
Diffstat (limited to 'tests/ci')
-rwxr-xr-xtests/ci/clean_images.sh7
-rwxr-xr-xtests/ci/yardstick-verify2
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