From 69798494c52b657c418a2b330f7a92ba8bd00efa Mon Sep 17 00:00:00 2001 From: Jamo Luhrsen Date: Mon, 15 Oct 2018 11:30:46 -0700 Subject: [PATCH] Fail if image delete does not succeed by ignoring the delte failure, we can end up creating images with duplicate names which confuse heat when trying to deploy stacks with images using those names. a delete can fail if an image is being used when the delete is issued. Change-Id: Iff82bd566d573cb2535236f46de9d7cb44c6aa4c Signed-off-by: Jamo Luhrsen --- jjb/opendaylight-infra-apex-image-management.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jjb/opendaylight-infra-apex-image-management.sh b/jjb/opendaylight-infra-apex-image-management.sh index 9f9ac7a3c..80054fa42 100644 --- a/jjb/opendaylight-infra-apex-image-management.sh +++ b/jjb/opendaylight-infra-apex-image-management.sh @@ -112,7 +112,7 @@ openstack image create \ # clean out any non ".new" OPNFV - apex images. In the case of a previously failed # or aborted apex management job, we can end up with multiple images with the same # name so being thorough here. -openstack image list | egrep 'OPNFV - apex' | egrep -v 'new' | awk '{print "openstack image delete",$2}' | sh || true +openstack image list | egrep 'OPNFV - apex' | egrep -v 'new' | awk '{print "openstack image delete",$2}' | sh openstack image set --name "$CONTROLLER_IMAGE_NAME" "$CONTROLLER_IMAGE_NAME.new" openstack image set --tag "Date Uploaded: $(date)" "$CONTROLLER_IMAGE_NAME" -- 2.36.6