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

diff --git a/tests/ci/clean_images.sh b/tests/ci/clean_images.sh
index cb5410ab2..832ade252 100755
--- a/tests/ci/clean_images.sh
+++ b/tests/ci/clean_images.sh
@@ -15,24 +15,24 @@ cleanup()
     echo
     echo "========== Cleanup =========="
 
-    if [ $OS_CACERT ] && [ "$(echo $OS_CACERT | tr '[:upper:]' '[:lower:]')" = "false" ]; then
+    if [ $OS_INSECURE ] && [ "$(echo $OS_INSECURE | tr '[:upper:]' '[:lower:]')" = "true" ]; then
         SECURE="--insecure"
     else
         SECURE=""
     fi
 
-    if ! openstack "${SECURE}" image list; then
+    if ! openstack ${SECURE} image list; then
         return
     fi
 
-    for image in $(openstack "${SECURE}" image list | grep -e cirros-0.3.5 -e yardstick-image -e Ubuntu-16.04 \
+    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..."
-        openstack "${SECURE}" image delete $image || true
+        openstack ${SECURE} image delete $image || true
     done
 
-    openstack "${SECURE}" flavor delete yardstick-flavor &> /dev/null || true
-    openstack "${SECURE}" flavor delete storperf &> /dev/null || true
+    openstack ${SECURE} flavor delete yardstick-flavor &> /dev/null || true
+    openstack ${SECURE} flavor delete storperf &> /dev/null || true
 }
 
 main()