From: Tim Rozet <trozet@redhat.com>
Date: Fri, 8 Jan 2016 02:21:28 +0000 (-0500)
Subject: Moves builds to use local images, minor fix to clean
X-Git-Tag: brahmaputra.1.rc0~14
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=8ddc8cd74a8de55a90d424d780d5ffc750bb8cad;p=apex.git

Moves builds to use local images, minor fix to clean

Change-Id: Ib8a3baa645c4e2a2b7b5c39e8642bae367981f37
Signed-off-by: Tim Rozet <trozet@redhat.com>
---

diff --git a/build/instack.sh b/build/instack.sh
index b4657e2a..958681ba 100755
--- a/build/instack.sh
+++ b/build/instack.sh
@@ -2,7 +2,8 @@
 set -e
 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
 RDO_RELEASE=liberty
@@ -201,9 +202,9 @@ for i in $IMAGES; do
     #if [ $i == "undercloud.qcow2" ]; then
     ### 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.
-    wget -nv -O stack/$i $rdo_images_uri/$i
+    #wget -nv -O stack/$i $rdo_images_uri/$i
     #else
-    #  curl $rdo_images_uri/$i -o stack/$i --verbose --silent --location
+    curl $rdo_images_uri/$i -o stack/$i
     #fi
   fi
   # only untar the tar files
diff --git a/ci/clean.sh b/ci/clean.sh
index bc193a34..89e89aa4 100755
--- a/ci/clean.sh
+++ b/ci/clean.sh
@@ -8,7 +8,13 @@ ovs_bridges="brbm brbm1 brbm2 brbm3"
 # Clean off instack VM
 virsh destroy instack 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
 
 # Clean off baremetal VMs in case they exist