X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Fci%2Fclean_images.sh;h=27da9e279ef342e79b4127fc37dbb7bc3cbec7e6;hb=1991dc99014359d15351f3da3eeaa6fc1348d632;hp=05f68a7ed12ee44299584cd212020c093d4786d3;hpb=bad9d331305e9e6331d7194d4b7232a61132e8a2;p=yardstick.git

diff --git a/tests/ci/clean_images.sh b/tests/ci/clean_images.sh
index 05f68a7ed..27da9e279 100755
--- a/tests/ci/clean_images.sh
+++ b/tests/ci/clean_images.sh
@@ -15,15 +15,23 @@ cleanup()
     echo
     echo "========== Cleanup =========="
 
-    if ! glance image-list; then
+    if ! openstack image list; then
         return
     fi
 
-    for image in $(glance image-list | grep -e cirros-0.3.3 -e yardstick-trusty-server -e Ubuntu-14.04 \
-        -e yardstick-vivid-kernel | awk '{print $2}'); do
+    for image in $(openstack image list | grep -e cirros-0.3.5 -e yardstick-image -e Ubuntu-16.04 \
+        | awk '{print $2}'); do
         echo "Deleting image $image..."
-        glance image-delete $image || true
+        openstack image delete $image || true
     done
 
-    nova flavor-delete yardstick-flavor &> /dev/null || true
+    openstack flavor delete yardstick-flavor &> /dev/null || true
+    openstack flavor delete storperf &> /dev/null || true
 }
+
+main()
+{
+    cleanup
+}
+
+main