X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Fci%2Fclean_images.sh;h=832ade25279d81e1b6f993dcb651f9edb8d0a72f;hb=dd233397485e9f8c222d6d8df57cfeed207c9209;hp=b1942160b210ac55466787d4fc153b080402cc2c;hpb=791868bdaabb08237fadae957a19c496a1892905;p=yardstick.git

diff --git a/tests/ci/clean_images.sh b/tests/ci/clean_images.sh
index b1942160b..832ade252 100755
--- a/tests/ci/clean_images.sh
+++ b/tests/ci/clean_images.sh
@@ -15,15 +15,29 @@ cleanup()
     echo
     echo "========== Cleanup =========="
 
-    if ! glance image-list; then
+    if [ $OS_INSECURE ] && [ "$(echo $OS_INSECURE | tr '[:upper:]' '[:lower:]')" = "true" ]; then
+        SECURE="--insecure"
+    else
+        SECURE=""
+    fi
+
+    if ! openstack ${SECURE} image list; then
         return
     fi
 
-    for image in $(glance image-list | grep -e cirros-0.3.3 -e yardstick-image -e Ubuntu-14.04 \
-        -e yardstick-vivid-kernel | awk '{print $2}'); do
+    for image in $(openstack ${SECURE} image list | grep -e cirros-0.3.5 -e cirros-d161201 -e yardstick-image -e Ubuntu-16.04 \
+        | awk '{print $2}'); do
         echo "Deleting image $image..."
-        glance image-delete $image || true
+        openstack ${SECURE} image delete $image || true
     done
 
-    nova flavor-delete yardstick-flavor &> /dev/null || true
+    openstack ${SECURE} flavor delete yardstick-flavor &> /dev/null || true
+    openstack ${SECURE} flavor delete storperf &> /dev/null || true
+}
+
+main()
+{
+    cleanup
 }
+
+main