You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cloudstack.apache.org by Hugo Trippaers <hu...@trippaers.nl> on 2013/09/20 12:40:11 UTC
Moved the systemvm to its own maven project
Hey all,
Just a heads-up that i pushed this commit to master:
commit 6c261042821c5597dab8d6be85dc59c948424e13
Author: Hugo Trippaers <ht...@schubergphilis.com>
Date: Fri Sep 20 18:08:20 2013 +0800
Move the system vm to a separate maven project.
All (almost) files belonging to the systemvm aer now centralize in the systemvm directory. The code for the separate functions is still in the services directory. This will make the code easier to understa
This commit effectively separates the code in the console-proxy from the actual building of the systemvm.iso. The systemvm profile (mvn -Psystemvm) will now control if the systemvm will be build entirely instead of just determining if the iso will be built. For slight speed up in the complete compile just leave the systemvm profile disabled.
I think this will make it more clear for everybody where the systemvm is located as its current location in console-proxy was a bit confusing.
Testing done:
* Setting up devcloud with new build and new systemvm.iso
* Verified ssvm operation (nfs secondary storage)
* Verified cvm operation
As with all maven changes don't forget to update the maven configuration in your IDE. (For eclipse users, right-click on the project, Maven -> Update Project)
Cheers,
Hugo
Re: Moved the systemvm to its own maven project
Posted by Darren Shepherd <da...@gmail.com>.
Hugo,
I emailed it to you directly, I'll put it below in this email, but
I'm using gmail and it might screw up the patch
>From b7e4e9c3770e44fb055007dcbdfb4ac9e426b787 Mon Sep 17 00:00:00 2001
From: Darren Shepherd <da...@godaddy.com>
Date: Sat, 21 Sep 2013 21:59:02 -0700
Subject: [PATCH] Update paths to reflect new location of systemvm patches in
git
---
tools/appliance/definitions/systemvmtemplate/postinstall.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/appliance/definitions/systemvmtemplate/postinstall.sh
b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
index 997d854..caee7b3 100644
--- a/tools/appliance/definitions/systemvmtemplate/postinstall.sh
+++ b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
@@ -203,12 +203,12 @@ configure_services() {
cd /opt
wget --no-check-certificate $snapshot_url -O cloudstack.tar.gz
tar -zxvf cloudstack.tar.gz
- cp -rv $snapshot_dir/patches/systemvm/debian/config/* /
- cp -rv $snapshot_dir/patches/systemvm/debian/vpn/* /
+ cp -rv $snapshot_dir/systemvm/patches/debian/config/* /
+ cp -rv $snapshot_dir/systemvm/patches/debian/vpn/* /
mkdir -p /usr/share/cloud/
- cd $snapshot_dir/patches/systemvm/debian/config
+ cd $snapshot_dir/systemvm/patches/debian/config
tar -cvf /usr/share/cloud/cloud-scripts.tar *
- cd $snapshot_dir/patches/systemvm/debian/vpn
+ cd $snapshot_dir/systemvm/patches/debian/vpn
tar -rvf /usr/share/cloud/cloud-scripts.tar *
cd /opt
rm -fr $snapshot_dir cloudstack.tar.gz
--
1.8.1.2
Re: Moved the systemvm to its own maven project
Posted by Hugo Trippaers <hu...@trippaers.nl>.
Good point!
BTW Did you submit the appliance patch yet?
Cheers,
Hugo
On Sep 23, 2013, at 3:25 PM, Darren Shepherd <da...@gmail.com> wrote:
> The rat exclude list needs to be updated for this too. Just noticed that is what is breaking the Jenkins rat builds right now.
>
> Darren
>
>> On Sep 21, 2013, at 10:11 PM, Hugo Trippaers <hu...@trippaers.nl> wrote:
>>
>> Attachements are filtered.
>>
>> Either send it in plain text or send it to my email directly and i'll commit it.
>>
>> Cheers,
>>
>> Hugo
>>
>>> On Sep 22, 2013, at 1:03 PM, Darren Shepherd <da...@gmail.com> wrote:
>>>
>>> I noticed that the tools/appliance/definitions/systemvmtemplate/postinstall.sh scripts was not updated to the new path. Review board seems to be down, so I'll just attempt to attach a patch to this email.
>>>
>>> Darren
>>
Re: Moved the systemvm to its own maven project
Posted by Darren Shepherd <da...@gmail.com>.
The rat exclude list needs to be updated for this too. Just noticed that is what is breaking the Jenkins rat builds right now.
Darren
> On Sep 21, 2013, at 10:11 PM, Hugo Trippaers <hu...@trippaers.nl> wrote:
>
> Attachements are filtered.
>
> Either send it in plain text or send it to my email directly and i'll commit it.
>
> Cheers,
>
> Hugo
>
>> On Sep 22, 2013, at 1:03 PM, Darren Shepherd <da...@gmail.com> wrote:
>>
>> I noticed that the tools/appliance/definitions/systemvmtemplate/postinstall.sh scripts was not updated to the new path. Review board seems to be down, so I'll just attempt to attach a patch to this email.
>>
>> Darren
>
Re: Moved the systemvm to its own maven project
Posted by Hugo Trippaers <hu...@trippaers.nl>.
Attachements are filtered.
Either send it in plain text or send it to my email directly and i'll commit it.
Cheers,
Hugo
On Sep 22, 2013, at 1:03 PM, Darren Shepherd <da...@gmail.com> wrote:
> I noticed that the tools/appliance/definitions/systemvmtemplate/postinstall.sh scripts was not updated to the new path. Review board seems to be down, so I'll just attempt to attach a patch to this email.
>
> Darren
>
Re: Moved the systemvm to its own maven project
Posted by Darren Shepherd <da...@gmail.com>.
I noticed that the
tools/appliance/definitions/systemvmtemplate/postinstall.sh scripts was not
updated to the new path. Review board seems to be down, so I'll just
attempt to attach a patch to this email.
Darren
Re: Moved the systemvm to its own maven project
Posted by Hugo Trippaers <hu...@trippaers.nl>.
Hey Darren,
Good find. I've moved the dependency to the systemvm profile, including the ant tasks to copy the systemvm to the right location.
Cheers,
Hugo
On Sep 21, 2013, at 4:55 AM, Darren Shepherd <da...@gmail.com> wrote:
> I think the build is broken now. client/pom.xml depends on cloud-systemvm,
> so if you don't put -Psystemvm the build breaks. I think the
> cloud-systemvm dep in client/pom.xml needs to be conditional on the
> systemvm profile.
>
> Darren
>
>
> On Fri, Sep 20, 2013 at 11:01 AM, Alex Huang <Al...@citrix.com> wrote:
>
>> Nice! Can't wait to look at this!
>>
>> --Alex
>>
>>> -----Original Message-----
>>> From: Trippie [mailto:trippie@gmail.com] On Behalf Of Hugo Trippaers
>>> Sent: Friday, September 20, 2013 3:40 AM
>>> To: dev@cloudstack.apache.org
>>> Subject: Moved the systemvm to its own maven project
>>>
>>> Hey all,
>>>
>>> Just a heads-up that i pushed this commit to master:
>>>
>>> commit 6c261042821c5597dab8d6be85dc59c948424e13
>>> Author: Hugo Trippaers <ht...@schubergphilis.com>
>>> Date: Fri Sep 20 18:08:20 2013 +0800
>>>
>>> Move the system vm to a separate maven project.
>>>
>>> All (almost) files belonging to the systemvm aer now centralize in
>> the
>>> systemvm directory. The code for the separate functions is still in the
>>> services directory. This will make the code easier to understa
>>>
>>>
>>> This commit effectively separates the code in the console-proxy from the
>>> actual building of the systemvm.iso. The systemvm profile (mvn
>> -Psystemvm)
>>> will now control if the systemvm will be build entirely instead of just
>>> determining if the iso will be built. For slight speed up in the complete
>>> compile just leave the systemvm profile disabled.
>>>
>>> I think this will make it more clear for everybody where the systemvm is
>>> located as its current location in console-proxy was a bit confusing.
>>>
>>> Testing done:
>>> * Setting up devcloud with new build and new systemvm.iso
>>> * Verified ssvm operation (nfs secondary storage)
>>> * Verified cvm operation
>>>
>>> As with all maven changes don't forget to update the maven configuration
>> in
>>> your IDE. (For eclipse users, right-click on the project, Maven -> Update
>>> Project)
>>>
>>> Cheers,
>>>
>>> Hugo
>>
Re: Moved the systemvm to its own maven project
Posted by Darren Shepherd <da...@gmail.com>.
I think the build is broken now. client/pom.xml depends on cloud-systemvm,
so if you don't put -Psystemvm the build breaks. I think the
cloud-systemvm dep in client/pom.xml needs to be conditional on the
systemvm profile.
Darren
On Fri, Sep 20, 2013 at 11:01 AM, Alex Huang <Al...@citrix.com> wrote:
> Nice! Can't wait to look at this!
>
> --Alex
>
> > -----Original Message-----
> > From: Trippie [mailto:trippie@gmail.com] On Behalf Of Hugo Trippaers
> > Sent: Friday, September 20, 2013 3:40 AM
> > To: dev@cloudstack.apache.org
> > Subject: Moved the systemvm to its own maven project
> >
> > Hey all,
> >
> > Just a heads-up that i pushed this commit to master:
> >
> > commit 6c261042821c5597dab8d6be85dc59c948424e13
> > Author: Hugo Trippaers <ht...@schubergphilis.com>
> > Date: Fri Sep 20 18:08:20 2013 +0800
> >
> > Move the system vm to a separate maven project.
> >
> > All (almost) files belonging to the systemvm aer now centralize in
> the
> > systemvm directory. The code for the separate functions is still in the
> > services directory. This will make the code easier to understa
> >
> >
> > This commit effectively separates the code in the console-proxy from the
> > actual building of the systemvm.iso. The systemvm profile (mvn
> -Psystemvm)
> > will now control if the systemvm will be build entirely instead of just
> > determining if the iso will be built. For slight speed up in the complete
> > compile just leave the systemvm profile disabled.
> >
> > I think this will make it more clear for everybody where the systemvm is
> > located as its current location in console-proxy was a bit confusing.
> >
> > Testing done:
> > * Setting up devcloud with new build and new systemvm.iso
> > * Verified ssvm operation (nfs secondary storage)
> > * Verified cvm operation
> >
> > As with all maven changes don't forget to update the maven configuration
> in
> > your IDE. (For eclipse users, right-click on the project, Maven -> Update
> > Project)
> >
> > Cheers,
> >
> > Hugo
>
RE: Moved the systemvm to its own maven project
Posted by Alex Huang <Al...@citrix.com>.
Nice! Can't wait to look at this!
--Alex
> -----Original Message-----
> From: Trippie [mailto:trippie@gmail.com] On Behalf Of Hugo Trippaers
> Sent: Friday, September 20, 2013 3:40 AM
> To: dev@cloudstack.apache.org
> Subject: Moved the systemvm to its own maven project
>
> Hey all,
>
> Just a heads-up that i pushed this commit to master:
>
> commit 6c261042821c5597dab8d6be85dc59c948424e13
> Author: Hugo Trippaers <ht...@schubergphilis.com>
> Date: Fri Sep 20 18:08:20 2013 +0800
>
> Move the system vm to a separate maven project.
>
> All (almost) files belonging to the systemvm aer now centralize in the
> systemvm directory. The code for the separate functions is still in the
> services directory. This will make the code easier to understa
>
>
> This commit effectively separates the code in the console-proxy from the
> actual building of the systemvm.iso. The systemvm profile (mvn -Psystemvm)
> will now control if the systemvm will be build entirely instead of just
> determining if the iso will be built. For slight speed up in the complete
> compile just leave the systemvm profile disabled.
>
> I think this will make it more clear for everybody where the systemvm is
> located as its current location in console-proxy was a bit confusing.
>
> Testing done:
> * Setting up devcloud with new build and new systemvm.iso
> * Verified ssvm operation (nfs secondary storage)
> * Verified cvm operation
>
> As with all maven changes don't forget to update the maven configuration in
> your IDE. (For eclipse users, right-click on the project, Maven -> Update
> Project)
>
> Cheers,
>
> Hugo