Commit 8ddc8cd7 authored by Tim Rozet's avatar Tim Rozet

Moves builds to use local images, minor fix to clean

Change-Id: Ib8a3baa645c4e2a2b7b5c39e8642bae367981f37
Signed-off-by: default avatarTim Rozet <trozet@redhat.com>
parent ddb27a25
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
set -e set -e
declare -i CNT declare -i CNT
rdo_images_uri=https://repos.fedorapeople.org/repos/openstack-m/rdo-images-centos-liberty-opnfv #rdo_images_uri=https://repos.fedorapeople.org/repos/openstack-m/rdo-images-centos-liberty-opnfv
rdo_images_uri=file:///stable-images
vm_index=4 vm_index=4
RDO_RELEASE=liberty RDO_RELEASE=liberty
...@@ -201,9 +202,9 @@ for i in $IMAGES; do ...@@ -201,9 +202,9 @@ for i in $IMAGES; do
#if [ $i == "undercloud.qcow2" ]; then #if [ $i == "undercloud.qcow2" ]; then
### there's a problem with the Content-Length reported by the centos artifacts ### there's a problem with the Content-Length reported by the centos artifacts
### server so using wget for it until a resolution is figured out. ### server so using wget for it until a resolution is figured out.
wget -nv -O stack/$i $rdo_images_uri/$i #wget -nv -O stack/$i $rdo_images_uri/$i
#else #else
# curl $rdo_images_uri/$i -o stack/$i --verbose --silent --location curl $rdo_images_uri/$i -o stack/$i
#fi #fi
fi fi
# only untar the tar files # only untar the tar files
......
...@@ -8,7 +8,13 @@ ovs_bridges="brbm brbm1 brbm2 brbm3" ...@@ -8,7 +8,13 @@ ovs_bridges="brbm brbm1 brbm2 brbm3"
# Clean off instack VM # Clean off instack VM
virsh destroy instack 2> /dev/null || echo -n '' virsh destroy instack 2> /dev/null || echo -n ''
virsh undefine instack --remove-all-storage 2> /dev/null || echo -n '' virsh undefine instack --remove-all-storage 2> /dev/null || echo -n ''
virsh vol-delete instack.qcow2 --pool default 2> /dev/null if ! virsh vol-delete instack.qcow2 --pool default; then
if [ ! -e /var/lib/libvirt/images/instack.qcow2 ]; then
/usr/bin/touch /var/lib/libvirt/images/instack.qcow2
virsh vol-delete instack.qcow2 --pool default
fi
fi
rm -f /var/lib/libvirt/images/instack.qcow2 2> /dev/null rm -f /var/lib/libvirt/images/instack.qcow2 2> /dev/null
# Clean off baremetal VMs in case they exist # Clean off baremetal VMs in case they exist
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment