From b1e75097739f5b53f084bf104c0ae62f112021c2 Mon Sep 17 00:00:00 2001 From: Vladimir Khlyunev Date: Mon, 25 Feb 2019 13:14:29 +0400 Subject: [PATCH] Initial fixes for build image job Change-Id: I117d5f1ea8349f955ef2b203df92f02be67ae93a --- maintenance-ci/common/scripts/prepare_build_upload_image.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/maintenance-ci/common/scripts/prepare_build_upload_image.sh b/maintenance-ci/common/scripts/prepare_build_upload_image.sh index ba9cd35..d46af68 100755 --- 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 -- 2.45.2