diff options
| author |   JingLu5 <lvjing5@huawei.com> | 2017-06-21 10:07:41 +0000 |
|---|---|---|
| committer |   Kubi <jean.gaoliang@huawei.com> | 2017-06-22 13:07:23 +0000 |
| commit | f92c10a994a2818d8e03ac0be35c6d697530bcb3 (patch) | |
| tree | 398ae33383589771d1dcaf64fc0a989d318f4933 /tests/ci/clean_images.sh | |
| parent | 9ae5680998c044bd4d9e39c6dba24ac55c252dd7 (diff) | |
HA testcase improvement
This patch improve HA test case in the following aspects:
1. the "GeneralHA" type now will check if the target service process in the controller node.
2. support ignore server certificate
3. add debug log for recovering service failed
4. improve method to kill keystone process
Change-Id: I9ae7ab54391fe41d5d7f3e4951a7ac2e3ba75968
Signed-off-by: JingLu5 <lvjing5@huawei.com>
(cherry picked from commit 5b99f1532ec4d15258ec86e970acd2904954b3bc)
Diffstat (limited to 'tests/ci/clean_images.sh')
| -rwxr-xr-x | tests/ci/clean_images.sh | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/tests/ci/clean_images.sh b/tests/ci/clean_images.sh index 27da9e279..cb5410ab2 100755 --- a/tests/ci/clean_images.sh +++ b/tests/ci/clean_images.sh @@ -15,18 +15,24 @@ cleanup() echo echo "========== Cleanup ==========" - if ! openstack 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 $(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 yardstick-image -e Ubuntu-16.04 \ | awk '{print $2}'); do echo "Deleting image $image..." - openstack image delete $image || true + openstack "${SECURE}" image delete $image || true 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() |