Merge "add ppm into result of pktgen to make result clear"

[yardstick.git] / tests / ci / clean_images.sh

diff --git a/tests/ci/clean_images.sh b/tests/ci/clean_images.sh
index f250064..832ade2 100755 (executable)
--- a/tests/ci/clean_images.sh
+++ b/tests/ci/clean_images.sh
@@ -15,7 +15,7 @@ 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=""
@@ -25,7 +25,7 @@ cleanup()
         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