X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Fci%2Fclean_images.sh;h=f25006487eafbbe2c2fc88caf41c6ff1b28e85f0;hb=1ff9df7e724eb0c981aebd5f5b8aa90db0da292b;hp=b1942160b210ac55466787d4fc153b080402cc2c;hpb=893294646833bed300586ee36040d4fde3c20842;p=yardstick.git

diff --git a/tests/ci/clean_images.sh b/tests/ci/clean_images.sh
index b1942160b..f25006487 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_CACERT ] && [ "$(echo $OS_CACERT | tr '[:upper:]' '[:lower:]')" = "false" ]; 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 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