Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 78827104F3 for ; Sat, 15 Jun 2013 02:52:16 +0000 (UTC) Received: (qmail 26198 invoked by uid 500); 15 Jun 2013 02:52:07 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 26089 invoked by uid 500); 15 Jun 2013 02:52:06 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 25492 invoked by uid 99); 15 Jun 2013 02:52:02 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 15 Jun 2013 02:52:02 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C0DF5881D53; Sat, 15 Jun 2013 02:52:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: edison@apache.org To: commits@cloudstack.apache.org Date: Sat, 15 Jun 2013 02:52:13 -0000 Message-Id: In-Reply-To: <945ac104d1e84e229519e8382bd02b4d@git.apache.org> References: <945ac104d1e84e229519e8382bd02b4d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [13/50] [abbrv] git commit: updated refs/heads/object_store to f41c800 Fix the build system VM job When both systemvmtemplate64 and systemvmtemplate are present the grep match fails and returns (non-deterministically) the 64bit appliance instead of the 32bit one. Fix this by matching the path separater as well. Signed-off-by: Prasanna Santhanam Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1c6e1012 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1c6e1012 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1c6e1012 Branch: refs/heads/object_store Commit: 1c6e1012dc8d741eb6e66f5c329561a3482cdbd8 Parents: 31f0e34 Author: Prasanna Santhanam Authored: Tue Jun 11 18:00:14 2013 +0530 Committer: Prasanna Santhanam Committed: Wed Jun 12 20:25:20 2013 +0530 ---------------------------------------------------------------------- tools/appliance/build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1c6e1012/tools/appliance/build.sh ---------------------------------------------------------------------- diff --git a/tools/appliance/build.sh b/tools/appliance/build.sh index 0216c06..b546c3f 100644 --- a/tools/appliance/build.sh +++ b/tools/appliance/build.sh @@ -46,7 +46,7 @@ done # Get appliance uuids machine_uuid=`vboxmanage showvminfo $appliance | grep UUID | head -1 | awk '{print $2}'` hdd_uuid=`vboxmanage showvminfo $appliance | grep vdi | head -1 | awk '{print $8}' | cut -d ')' -f 1` -hdd_path=`vboxmanage list hdds | grep $appliance | grep vdi | cut -c 14-` +hdd_path=`vboxmanage list hdds | grep "$appliance\/" | grep vdi | cut -c 14-` # Remove any shared folder shared_folders=`vboxmanage showvminfo $appliance | grep Name | grep Host` @@ -67,7 +67,7 @@ mkdir dist set -e # Export for Xen -vboxmanage internalcommands converttoraw "$hdd_path" img.raw +vboxmanage internalcommands converttoraw -format vdi "$hdd_path" img.raw faketime '2010-01-01' vhd-util convert -s 0 -t 1 -i img.raw -o stagefixed.vhd faketime '2010-01-01' vhd-util convert -s 1 -t 2 -i stagefixed.vhd -o $appliance-$build_date-$branch-xen.vhd rm *.bak @@ -75,7 +75,7 @@ bzip2 $appliance-$build_date-$branch-xen.vhd echo "$appliance exported for Xen: dist/$appliance-$build_date-$branch-xen.vhd.bz2" # Export for KVM -vboxmanage internalcommands converttoraw "$hdd_path" raw.img +vboxmanage internalcommands converttoraw -format vdi "$hdd_path" raw.img qemu-img convert -f raw -c -O qcow2 raw.img $appliance-$build_date-$branch-kvm.qcow2 rm raw.img bzip2 $appliance-$build_date-$branch-kvm.qcow2