aboutsummaryrefslogtreecommitdiffstats
path: root/tests/ci
diff options
context:
space:
mode:
authorchenjiankun <chenjiankun1@huawei.com>2016-12-15 06:02:50 +0000
committerchenjiankun <chenjiankun1@huawei.com>2016-12-22 11:33:38 +0000
commite88d02c9d87c18dbaaf849d8b10167e6dadf485a (patch)
tree2d18c94d63599dedeaf48c2ddf2ad4f5bd00de3b /tests/ci
parent70d25b87c167bc13e883da2963980cce56410f98 (diff)
Bugfix: the load_image.sh script will load a image with the same name
JIRA: YARDSTICK-471 Currently, if we execute the load_image.sh and the openstack already have this image in the cloud,this script will load another image with the same name. This will make yardstick run error. So I clean this related images before loading. Change-Id: If5b985ef9b2e890aa10453810fac36867d320a06 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
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