diff options
| -rw-r--r-- | build/cache.mk | 11 | ||||
| -rwxr-xr-x | build/instack.sh | 16 |
2 files changed, 14 insertions, 13 deletions
diff --git a/build/cache.mk b/build/cache.mk index 29a7c252..b1e97904 100644 --- a/build/cache.mk +++ b/build/cache.mk @@ -16,14 +16,9 @@ CACHECLEAN := $(addsuffix .clean,$(CACHEFILES) $(CACHEDIRS)) # BEGIN of variables to customize # CACHEFILES += .versions -CACHEFILES += stack/deploy-ramdisk-ironic.initramfs -CACHEFILES += stack/deploy-ramdisk-ironic.kernel -CACHEFILES += stack/ironic-python-agent.initramfs -CACHEFILES += stack/ironic-python-agent.kernel -CACHEFILES += stack/ironic-python-agent.vmlinuz -CACHEFILES += stack/overcloud-full.initrd -CACHEFILES += stack/overcloud-full.qcow2 -CACHEFILES += stack/overcloud-full.vmlinuz +CACHEFILES += stack/deploy-ramdisk-ironic.tar +CACHEFILES += stack/ironic-python-agent.tar +CACHEFILES += stack/overcloud-full.tar CACHEFILES += $(shell basename $(ISOSRC)) # # END of variables to customize diff --git a/build/instack.sh b/build/instack.sh index 9b900698..f73328ce 100755 --- a/build/instack.sh +++ b/build/instack.sh @@ -2,8 +2,10 @@ set -e declare -i CNT +rdo_images_uri=https://ci.centos.org/artifacts/rdo/images/liberty/delorean/stable + vm_index=4 -RDO_RELEASE=kilo +RDO_RELEASE=liberty SSH_OPTIONS=(-o StrictHostKeyChecking=no -o GlobalKnownHostsFile=/dev/null -o UserKnownHostsFile=/dev/null) # check for dependancy packages @@ -187,13 +189,17 @@ sudo cp /var/lib/libvirt/images/instack.qcow2 ./instack.qcow2 # pull down the the built images echo "Copying overcloud resources" -IMAGES="deploy-ramdisk-ironic.initramfs deploy-ramdisk-ironic.kernel" -IMAGES+=" ironic-python-agent.initramfs ironic-python-agent.kernel ironic-python-agent.vmlinuz" -IMAGES+=" overcloud-full.initrd overcloud-full.qcow2 overcloud-full.vmlinuz" +IMAGES="deploy-ramdisk-ironic.tar" +IMAGES+=" ironic-python-agent.tar" +IMAGES+=" overcloud-full.tar" +#IMAGES+="undercloud.qcow2" for i in $IMAGES; do # download prebuilt images from RDO Project - curl https://repos.fedorapeople.org/repos/openstack-m/rdo-images-centos-liberty/$i -z stack/$i -o stack/$i --verbose --silent --location + if [ "$(curl -L $rdo_images_uri/${i}.md5 | awk {'print $1'})" != "$(md5sum stack/$i | awk {'print $1'})" ] ; then + curl https://ci.centos.org/artifacts/rdo/images/liberty/delorean/stable/$i -o stack/$i --verbose --silent --location + fi + tar -xf stack/$i -C stack/ done #Adding OpenDaylight to overcloud |