Initial fixes for build image job

Change-Id: I117d5f1ea8349f955ef2b203df92f02be67ae93a

diff --git a/maintenance-ci/common/scripts/prepare_build_upload_image.sh b/maintenance-ci/common/scripts/prepare_build_upload_image.sh
index ba9cd3577f9e8791a3bc580e9877b56d36f3a119..d46af6872c744e37b920ba384092644c968a8b36 100755 (executable)
--- a/maintenance-ci/common/scripts/prepare_build_upload_image.sh
+++ b/maintenance-ci/common/scripts/prepare_build_upload_image.sh
@@ -12,7 +12,7 @@ popd
 
 echo "${UPDATE_SCRIPT?} will be used for image building"
 
-if [[ ! -f xenial-server-cloudimg&&md64-disk1.img.bkp ]] ; then
+if [[ ! -f /tmp/xenial-server-cloudimg-amd64-disk1.img ]] ; then
   wget -q https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img -O /tmp/xenial-server-cloudimg-amd64-disk1.img
   cp /tmp/xenial-server-cloudimg-amd64-disk1.img xenial-server-cloudimg-amd64-disk1.img
 else
@@ -52,7 +52,7 @@ sudo umount -l /mnt/image
 sudo qemu-nbd -d /dev/nbd0
 sudo rm -rf /mnt/image
 
-if [[ $TEST_AFTER_BUILD ]] ; then
+if [[ "${TEST_AFTER_BUILD}" == "true" ]] ; then
   GLANCE_IMAGE_NAME="${IMAGE_NAME}-staging"
 else
   GLANCE_IMAGE_NAME="${IMAGE_NAME}"
@@ -70,6 +70,6 @@ fi
 source "${OPENSTACK_CLIENTS_VENV}"/bin/activate
 
 set -x
-openstack image delete "${GLANCE_IMAGE_NAME}"
+openstack image delete "${GLANCE_IMAGE_NAME}" || true
 openstack image create --disk-format qcow2 --container-format bare --file xenial-server-cloudimg-amd64-disk1.img "${GLANCE_IMAGE_NAME}"
 deactivate
\ No newline at end of file