You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sw...@apache.org on 2014/11/21 11:59:29 UTC
git commit: updated refs/heads/master to 8e689b1
Repository: cloudstack
Updated Branches:
refs/heads/master 83656a6ea -> 8e689b114
Updated the system vm build to remove incompatible qemu-img 'compat' option
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8e689b11
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8e689b11
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8e689b11
Branch: refs/heads/master
Commit: 8e689b1148e07d98378bb87f54528a92f79acedd
Parents: 83656a6
Author: Will Stevens <ws...@cloudops.com>
Authored: Fri Nov 21 05:59:06 2014 -0500
Committer: Will Stevens <ws...@cloudops.com>
Committed: Fri Nov 21 05:59:06 2014 -0500
----------------------------------------------------------------------
tools/appliance/build.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8e689b11/tools/appliance/build.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/build.sh b/tools/appliance/build.sh
index afbae50..4ff99b8 100755
--- a/tools/appliance/build.sh
+++ b/tools/appliance/build.sh
@@ -427,7 +427,7 @@ function kvm_export() {
log INFO "creating kvm export"
local hdd_path="${1}"
vboxmanage internalcommands converttoraw -format vdi "${hdd_path}" raw.img
- qemu-img convert -o compat=0.10 -f raw -c -O qcow2 raw.img "${appliance_build_name}-kvm.qcow2"
+ qemu-img convert -f raw -c -O qcow2 raw.img "${appliance_build_name}-kvm.qcow2"
add_on_exit rm -f raw.img
bzip2 "${appliance_build_name}-kvm.qcow2"
mv "${appliance_build_name}-kvm.qcow2.bz2" dist/
Re: git commit: updated refs/heads/master to 8e689b1
Posted by Rohit Yadav <ro...@shapeblue.com>.
> On 21-Nov-2014, at 6:43 pm, Will Stevens <ws...@cloudops.com> wrote:
>
> I created an issue for this:
> https://issues.apache.org/jira/browse/CLOUDSTACK-7959
>
> How do we deal with the fact that the system vm build machines do not
> support this option? By removing this, the master system vms now build
> again. If this is required for RHEL 6, do we have to update our system vm
> build systems so we can pass this flag without it completely breaking the
> builds?
+1
Good idea. I’ll see if Hugo, Talluri or someone with access on jenkins.b.o can help us explore/fix this.
At the same time, let’s wait for Edison’s reply on this.
>
> Will
>
>
> *Will STEVENS*
> Lead Developer
>
> *CloudOps* *| *Cloud Solutions Experts
> 420 rue Guy *|* Montreal *|* Quebec *|* H3J 1S6
> w cloudops.com *|* tw @CloudOps_
>
> On Fri, Nov 21, 2014 at 7:58 AM, Rohit Yadav <bh...@apache.org> wrote:
>
>> Hi,
>>
>> On Fri, Nov 21, 2014 at 4:29 PM, <sw...@apache.org> wrote:
>>
>>> Repository: cloudstack
>>> Updated Branches:
>>> refs/heads/master 83656a6ea -> 8e689b114
>>>
>>>
>>> Updated the system vm build to remove incompatible qemu-img 'compat'
>> option
>>>
>>>
>> This sort of reverts the following fix from Edison; (should we do it as the
>> following commit mentions not using compatibility breaks the systemvm in
>> some environment?)
>>
>> commit 05bec59c1498dbcfb8a1089c86855fd3b433ea58
>> Author: Edison Su <su...@gmail.com>
>> Date: Thu Nov 6 15:09:31 2014 -0800
>>
>> CS-27148 system vm image build process, needs to build an old version
>> of qemu image, otherwise, it won't work on RHEL 6 Reviewed-by:Frank
>>
>>
>>
>>
>>>
>>> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
>>> Commit:
>> http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8e689b11
>>> Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8e689b11
>>> Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8e689b11
>>>
>>> Branch: refs/heads/master
>>> Commit: 8e689b1148e07d98378bb87f54528a92f79acedd
>>> Parents: 83656a6
>>> Author: Will Stevens <ws...@cloudops.com>
>>> Authored: Fri Nov 21 05:59:06 2014 -0500
>>> Committer: Will Stevens <ws...@cloudops.com>
>>> Committed: Fri Nov 21 05:59:06 2014 -0500
>>>
>>> ----------------------------------------------------------------------
>>> tools/appliance/build.sh | 2 +-
>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>> ----------------------------------------------------------------------
>>>
>>>
>>>
>>>
>> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8e689b11/tools/appliance/build.sh
>>> ----------------------------------------------------------------------
>>> diff --git a/tools/appliance/build.sh b/tools/appliance/build.sh
>>> index afbae50..4ff99b8 100755
>>> --- a/tools/appliance/build.sh
>>> +++ b/tools/appliance/build.sh
>>> @@ -427,7 +427,7 @@ function kvm_export() {
>>> log INFO "creating kvm export"
>>> local hdd_path="${1}"
>>> vboxmanage internalcommands converttoraw -format vdi "${hdd_path}"
>>> raw.img
>>> - qemu-img convert -o compat=0.10 -f raw -c -O qcow2 raw.img
>>> "${appliance_build_name}-kvm.qcow2"
>>> + qemu-img convert -f raw -c -O qcow2 raw.img
>>> "${appliance_build_name}-kvm.qcow2"
>>> add_on_exit rm -f raw.img
>>> bzip2 "${appliance_build_name}-kvm.qcow2"
>>> mv "${appliance_build_name}-kvm.qcow2.bz2" dist/
>>>
>>>
>>
Regards,
Rohit Yadav
Software Architect, ShapeBlue
M. +91 88 262 30892 | rohit.yadav@shapeblue.com
Blog: bhaisaab.org | Twitter: @_bhaisaab
Find out more about ShapeBlue and our range of CloudStack related services
IaaS Cloud Design & Build<http://shapeblue.com/iaas-cloud-design-and-build//>
CSForge – rapid IaaS deployment framework<http://shapeblue.com/csforge/>
CloudStack Consulting<http://shapeblue.com/cloudstack-consultancy/>
CloudStack Software Engineering<http://shapeblue.com/cloudstack-software-engineering/>
CloudStack Infrastructure Support<http://shapeblue.com/cloudstack-infrastructure-support/>
CloudStack Bootcamp Training Courses<http://shapeblue.com/cloudstack-training/>
This email and any attachments to it may be confidential and are intended solely for the use of the individual to whom it is addressed. Any views or opinions expressed are solely those of the author and do not necessarily represent those of Shape Blue Ltd or related companies. If you are not the intended recipient of this email, you must neither take any action based upon its contents, nor copy or show it to anyone. Please contact the sender if you believe you have received this email in error. Shape Blue Ltd is a company incorporated in England & Wales. ShapeBlue Services India LLP is a company incorporated in India and is operated under license from Shape Blue Ltd. Shape Blue Brasil Consultoria Ltda is a company incorporated in Brasil and is operated under license from Shape Blue Ltd. ShapeBlue SA Pty Ltd is a company registered by The Republic of South Africa and is traded under license from Shape Blue Ltd. ShapeBlue is a registered trademark.
Re: git commit: updated refs/heads/master to 8e689b1
Posted by Will Stevens <ws...@cloudops.com>.
I created an issue for this:
https://issues.apache.org/jira/browse/CLOUDSTACK-7959
How do we deal with the fact that the system vm build machines do not
support this option? By removing this, the master system vms now build
again. If this is required for RHEL 6, do we have to update our system vm
build systems so we can pass this flag without it completely breaking the
builds?
Will
*Will STEVENS*
Lead Developer
*CloudOps* *| *Cloud Solutions Experts
420 rue Guy *|* Montreal *|* Quebec *|* H3J 1S6
w cloudops.com *|* tw @CloudOps_
On Fri, Nov 21, 2014 at 7:58 AM, Rohit Yadav <bh...@apache.org> wrote:
> Hi,
>
> On Fri, Nov 21, 2014 at 4:29 PM, <sw...@apache.org> wrote:
>
> > Repository: cloudstack
> > Updated Branches:
> > refs/heads/master 83656a6ea -> 8e689b114
> >
> >
> > Updated the system vm build to remove incompatible qemu-img 'compat'
> option
> >
> >
> This sort of reverts the following fix from Edison; (should we do it as the
> following commit mentions not using compatibility breaks the systemvm in
> some environment?)
>
> commit 05bec59c1498dbcfb8a1089c86855fd3b433ea58
> Author: Edison Su <su...@gmail.com>
> Date: Thu Nov 6 15:09:31 2014 -0800
>
> CS-27148 system vm image build process, needs to build an old version
> of qemu image, otherwise, it won't work on RHEL 6 Reviewed-by:Frank
>
>
>
>
> >
> > Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
> > Commit:
> http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8e689b11
> > Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8e689b11
> > Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8e689b11
> >
> > Branch: refs/heads/master
> > Commit: 8e689b1148e07d98378bb87f54528a92f79acedd
> > Parents: 83656a6
> > Author: Will Stevens <ws...@cloudops.com>
> > Authored: Fri Nov 21 05:59:06 2014 -0500
> > Committer: Will Stevens <ws...@cloudops.com>
> > Committed: Fri Nov 21 05:59:06 2014 -0500
> >
> > ----------------------------------------------------------------------
> > tools/appliance/build.sh | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> > ----------------------------------------------------------------------
> >
> >
> >
> >
> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8e689b11/tools/appliance/build.sh
> > ----------------------------------------------------------------------
> > diff --git a/tools/appliance/build.sh b/tools/appliance/build.sh
> > index afbae50..4ff99b8 100755
> > --- a/tools/appliance/build.sh
> > +++ b/tools/appliance/build.sh
> > @@ -427,7 +427,7 @@ function kvm_export() {
> > log INFO "creating kvm export"
> > local hdd_path="${1}"
> > vboxmanage internalcommands converttoraw -format vdi "${hdd_path}"
> > raw.img
> > - qemu-img convert -o compat=0.10 -f raw -c -O qcow2 raw.img
> > "${appliance_build_name}-kvm.qcow2"
> > + qemu-img convert -f raw -c -O qcow2 raw.img
> > "${appliance_build_name}-kvm.qcow2"
> > add_on_exit rm -f raw.img
> > bzip2 "${appliance_build_name}-kvm.qcow2"
> > mv "${appliance_build_name}-kvm.qcow2.bz2" dist/
> >
> >
>
Re: git commit: updated refs/heads/master to 8e689b1
Posted by Rohit Yadav <bh...@apache.org>.
Hi,
On Fri, Nov 21, 2014 at 4:29 PM, <sw...@apache.org> wrote:
> Repository: cloudstack
> Updated Branches:
> refs/heads/master 83656a6ea -> 8e689b114
>
>
> Updated the system vm build to remove incompatible qemu-img 'compat' option
>
>
This sort of reverts the following fix from Edison; (should we do it as the
following commit mentions not using compatibility breaks the systemvm in
some environment?)
commit 05bec59c1498dbcfb8a1089c86855fd3b433ea58
Author: Edison Su <su...@gmail.com>
Date: Thu Nov 6 15:09:31 2014 -0800
CS-27148 system vm image build process, needs to build an old version
of qemu image, otherwise, it won't work on RHEL 6 Reviewed-by:Frank
>
> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
> Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8e689b11
> Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8e689b11
> Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8e689b11
>
> Branch: refs/heads/master
> Commit: 8e689b1148e07d98378bb87f54528a92f79acedd
> Parents: 83656a6
> Author: Will Stevens <ws...@cloudops.com>
> Authored: Fri Nov 21 05:59:06 2014 -0500
> Committer: Will Stevens <ws...@cloudops.com>
> Committed: Fri Nov 21 05:59:06 2014 -0500
>
> ----------------------------------------------------------------------
> tools/appliance/build.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> ----------------------------------------------------------------------
>
>
>
> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8e689b11/tools/appliance/build.sh
> ----------------------------------------------------------------------
> diff --git a/tools/appliance/build.sh b/tools/appliance/build.sh
> index afbae50..4ff99b8 100755
> --- a/tools/appliance/build.sh
> +++ b/tools/appliance/build.sh
> @@ -427,7 +427,7 @@ function kvm_export() {
> log INFO "creating kvm export"
> local hdd_path="${1}"
> vboxmanage internalcommands converttoraw -format vdi "${hdd_path}"
> raw.img
> - qemu-img convert -o compat=0.10 -f raw -c -O qcow2 raw.img
> "${appliance_build_name}-kvm.qcow2"
> + qemu-img convert -f raw -c -O qcow2 raw.img
> "${appliance_build_name}-kvm.qcow2"
> add_on_exit rm -f raw.img
> bzip2 "${appliance_build_name}-kvm.qcow2"
> mv "${appliance_build_name}-kvm.qcow2.bz2" dist/
>
>
Re: git commit: updated refs/heads/master to 8e689b1
Posted by Rohit Yadav <bh...@apache.org>.
Hi,
On Fri, Nov 21, 2014 at 4:29 PM, <sw...@apache.org> wrote:
> Repository: cloudstack
> Updated Branches:
> refs/heads/master 83656a6ea -> 8e689b114
>
>
> Updated the system vm build to remove incompatible qemu-img 'compat' option
>
>
This sort of reverts the following fix from Edison; (should we do it as the
following commit mentions not using compatibility breaks the systemvm in
some environment?)
commit 05bec59c1498dbcfb8a1089c86855fd3b433ea58
Author: Edison Su <su...@gmail.com>
Date: Thu Nov 6 15:09:31 2014 -0800
CS-27148 system vm image build process, needs to build an old version
of qemu image, otherwise, it won't work on RHEL 6 Reviewed-by:Frank
>
> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
> Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8e689b11
> Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8e689b11
> Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8e689b11
>
> Branch: refs/heads/master
> Commit: 8e689b1148e07d98378bb87f54528a92f79acedd
> Parents: 83656a6
> Author: Will Stevens <ws...@cloudops.com>
> Authored: Fri Nov 21 05:59:06 2014 -0500
> Committer: Will Stevens <ws...@cloudops.com>
> Committed: Fri Nov 21 05:59:06 2014 -0500
>
> ----------------------------------------------------------------------
> tools/appliance/build.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> ----------------------------------------------------------------------
>
>
>
> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8e689b11/tools/appliance/build.sh
> ----------------------------------------------------------------------
> diff --git a/tools/appliance/build.sh b/tools/appliance/build.sh
> index afbae50..4ff99b8 100755
> --- a/tools/appliance/build.sh
> +++ b/tools/appliance/build.sh
> @@ -427,7 +427,7 @@ function kvm_export() {
> log INFO "creating kvm export"
> local hdd_path="${1}"
> vboxmanage internalcommands converttoraw -format vdi "${hdd_path}"
> raw.img
> - qemu-img convert -o compat=0.10 -f raw -c -O qcow2 raw.img
> "${appliance_build_name}-kvm.qcow2"
> + qemu-img convert -f raw -c -O qcow2 raw.img
> "${appliance_build_name}-kvm.qcow2"
> add_on_exit rm -f raw.img
> bzip2 "${appliance_build_name}-kvm.qcow2"
> mv "${appliance_build_name}-kvm.qcow2.bz2" dist/
>
>