diff options
| author |   Tim Rozet <trozet@redhat.com> | 2015-10-16 17:13:37 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-10-16 17:13:37 +0000 |
| commit | 24e05320bd6be675c0043f659d988c751f34f302 (patch) | |
| tree | a14c9c083498095f1261bfad0db5b726315cf2d1 | |
| parent | b27ac55a3a9c60924f49aee4e3171d529e18ef33 (diff) | |
| parent | b85921456409bab0f4fa2d4ba5ac74eb3cd2721a (diff) | |
Merge "updates to the instack VM"
| -rw-r--r-- | build/Makefile | 2 | ||||
| -rwxr-xr-x | build/instack.sh | 12 | ||||
| -rwxr-xr-x | ci/build.sh | 7 |
3 files changed, 13 insertions, 8 deletions
diff --git a/build/Makefile b/build/Makefile index 38099089..c2ceea95 100644 --- a/build/Makefile +++ b/build/Makefile @@ -132,8 +132,6 @@ instack-clean: rm -f baremetalbrbm_1.xml rm -f instack.xml rm -f instack.qcow2 - rm -rf stack - .PHONY: iso iso: build-clean instack.qcow2 rpm $(ISOCACHE) diff --git a/build/instack.sh b/build/instack.sh index 7d20b76d..5ac08763 100755 --- a/build/instack.sh +++ b/build/instack.sh @@ -77,7 +77,7 @@ virsh destroy baremetalbrbm_0 2> /dev/null || echo -n '' virsh undefine baremetalbrbm_0 --remove-all-storage 2> /dev/null || echo -n '' virsh destroy baremetalbrbm_1 2> /dev/null || echo -n '' virsh undefine baremetalbrbm_1 --remove-all-storage 2> /dev/null || echo -n '' -instack-virt-setup +NODE_CPU=2 NODE_MEM=8192 instack-virt-setup EOI # attach undercloud to the underlay network for @@ -125,6 +125,9 @@ EOI # install undercloud on Undercloud VM ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" "openstack undercloud install" +# Clean cache to reduce the images size +ssh -T ${SSH_OPTIONS[@]} "root@$UNDERCLOUD" "yum clean all" + # make a copy of instack VM's definitions, and disk image # it must be stopped to make a copy of its disk image ssh -T ${SSH_OPTIONS[@]} stack@localhost <<EOI @@ -147,7 +150,6 @@ fi echo "\nCopying instack disk image and starting instack VM." virsh dumpxml baremetalbrbm_0 > baremetalbrbm_0.xml virsh dumpxml baremetalbrbm_1 > baremetalbrbm_1.xml -cp -f /var/lib/libvirt/images/instack.qcow2 . virsh dumpxml instack > instack.xml #virsh vol-dumpxml instack.qcow2 --pool default > instack.qcow2.xml virsh net-dumpxml brbm > brbm.xml @@ -160,8 +162,10 @@ scp ${SSH_OPTIONS[@]} stack@localhost:baremetalbrbm_0.xml . scp ${SSH_OPTIONS[@]} stack@localhost:baremetalbrbm_1.xml . scp ${SSH_OPTIONS[@]} stack@localhost:instack.xml . scp ${SSH_OPTIONS[@]} stack@localhost:brbm.xml . -scp ${SSH_OPTIONS[@]} stack@localhost:instack.qcow2 . - +sudo cp /var/lib/libvirt/images/instack.qcow2 ./instack.qcow2_ +sudo chown $(whoami):$(whoami) ./instack.qcow2_ +virt-sparsify --check-tmpdir=fail ./instack.qcow2_ ./instack.qcow2 +rm -f ./instack.qcow2_ # start the instack VM back up to continue installation echo "Waiting for instack VM to start" diff --git a/ci/build.sh b/ci/build.sh index 9159f23e..91d78ac9 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -389,8 +389,11 @@ fi echo "Copying built OPNFV .iso file to target directory ${BUILD_DIR} ..." rm -rf ${BUILD_DIR} mkdir -p ${BUILD_DIR} -cp ${BUILD_BASE}/.versions ${BUILD_DIR} -cp ${RESULT_DIR}/*.iso* ${BUILD_DIR} +ls -s ${BUILD_BASE}/.versions ${BUILD_DIR} +ls -s ${RESULT_DIR}/*.iso* ${BUILD_DIR} +echo "Copying built OPNFV .rpm files to target directory ${BUILD_DIR} ..." +ls -s ${BUILD_BASE}/*.rpm ${BUILD_DIR} +ls -s ${BUILD_BASE}/noarch/*.rpm ${BUILD_DIR} if [ $POPULATE_CACHE -eq 1 ]; then if [ ! -z ${BUILD_CACHE_URI} ]; then |