Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix Cirros image name in CI script
[yardstick.git]
/
tests
/
ci
/
clean_images.sh
diff --git
a/tests/ci/clean_images.sh
b/tests/ci/clean_images.sh
index
27da9e2
..
832ade2
100755
(executable)
--- a/
tests/ci/clean_images.sh
+++ b/
tests/ci/clean_images.sh
@@
-15,18
+15,24
@@
cleanup()
echo
echo "========== Cleanup =========="
echo
echo "========== Cleanup =========="
- if ! openstack 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
return
fi
- for image in $(openstack
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..."
| awk '{print $2}'); do
echo "Deleting image $image..."
- openstack image delete $image || true
+ openstack
${SECURE}
image delete $image || true
done
done
- openstack flavor delete yardstick-flavor &> /dev/null || true
- openstack flavor delete storperf &> /dev/null || true
+ openstack
${SECURE}
flavor delete yardstick-flavor &> /dev/null || true
+ openstack
${SECURE}
flavor delete storperf &> /dev/null || true
}
main()
}
main()