You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2012/10/16 18:09:12 UTC

git commit: DevCloud: Make sure destination paths exists before scp

Updated Branches:
  refs/heads/4.0 6c6d9bb89 -> 53a3c2f17


DevCloud: Make sure destination paths exists before scp

Makes dirs if they are not present before scp-ing target/ and dist/ to
devcloud.

Signed-off-by: Rohit Yadav <bh...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/53a3c2f1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/53a3c2f1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/53a3c2f1

Branch: refs/heads/4.0
Commit: 53a3c2f171dfea5de6e0cda2ae3317560ecd91f5
Parents: 6c6d9bb
Author: Rohit Yadav <bh...@apache.org>
Authored: Tue Oct 16 21:38:05 2012 +0530
Committer: Rohit Yadav <bh...@apache.org>
Committed: Tue Oct 16 21:38:05 2012 +0530

----------------------------------------------------------------------
 build/build-devcloud.xml |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/53a3c2f1/build/build-devcloud.xml
----------------------------------------------------------------------
diff --git a/build/build-devcloud.xml b/build/build-devcloud.xml
index a001dc2..d5a6fb8 100644
--- a/build/build-devcloud.xml
+++ b/build/build-devcloud.xml
@@ -80,12 +80,14 @@
     </scp>
 
     <echo message="copying target folder to remote"/>
+    <sshexec trust="yes" host="${host}" port="${port}" username="root" password="password" command="cd /opt/cloudstack/incubator-cloudstack; mkdir -p target"/>
     <scp trust="yes" port="${port}" todir="root:password@${host}:/opt/cloudstack/incubator-cloudstack/target">
       <fileset dir="target">
       </fileset>
     </scp>
 
     <echo message="copying dist folder to remote"/>
+    <sshexec trust="yes" host="${host}" port="${port}" username="root" password="password" command="cd /opt/cloudstack/incubator-cloudstack; mkdir -p dist"/>
     <scp trust="yes" port="${port}" todir="root:password@${host}:/opt/cloudstack/incubator-cloudstack/dist">
       <fileset dir="dist">
       </fileset>


Re: git commit: DevCloud: Make sure destination paths exists before scp

Posted by David Nalley <da...@gnsa.us>.
On Tue, Oct 16, 2012 at 4:41 PM, Rohit Yadav <ro...@citrix.com> wrote:
> This (DevCloud using ant) only works with ant and since we've maven on master now, it's not applicable for master.
>


Ahh - ok  - thanks for explaining!

--David

Re: git commit: DevCloud: Make sure destination paths exists before scp

Posted by Rohit Yadav <ro...@citrix.com>.
On 17-Oct-2012, at 2:37 AM, Edison Su <Ed...@citrix.com> wrote:

> I think we don't need this patch at all, target/dist folder are created when I build devcloud, so if you don't delete them explicitly, there shouldn't have any problem.

Yes, but as on the 4.0 test procedure wiki, when we clean up the environment using:
ssh root@localhost -p 2222 'cd /opt/cloudstack/; rm -rf apache-tomcat-6.0.32; unzip apache-tomcat-6.0.32.zip; cd incubator-cloudstack; git clean -f; git reset --hard; git pull --rebase; git clean -f; git  checkout origin/4.0 -b 4.0 -f '

git clean -f, removes dist/ which fails that's why the patch makes sure the paths exists before scp-ing.

> But anyway, it's no harm to add this patch.

Regards.

>> -----Original Message-----
>> From: Rohit Yadav [mailto:rohit.yadav@citrix.com]
>> Sent: Tuesday, October 16, 2012 1:42 PM
>> To: cloudstack-dev@incubator.apache.org
>> Subject: RE: git commit: DevCloud: Make sure destination paths exists
>> before scp
>> 
>> This (DevCloud using ant) only works with ant and since we've maven on
>> master now, it's not applicable for master.
>> 
>> ________________________________________
>> From: David Nalley [david@gnsa.us]
>> Sent: Wednesday, October 17, 2012 1:47 AM
>> To: cloudstack-dev@incubator.apache.org
>> Subject: Re: git commit: DevCloud: Make sure destination paths exists
>> before scp
>> 
>> Is there a reason this only hit 4.0?
>> 
>> --David
>> 
>> On Tue, Oct 16, 2012 at 12:09 PM,  <bh...@apache.org> wrote:
>>> Updated Branches:
>>>  refs/heads/4.0 6c6d9bb89 -> 53a3c2f17
>>> 
>>> 
>>> DevCloud: Make sure destination paths exists before scp
>>> 
>>> Makes dirs if they are not present before scp-ing target/ and dist/
>> to
>>> devcloud.
>>> 
>>> Signed-off-by: Rohit Yadav <bh...@apache.org>
>>> 
>>> 
>>> Project: http://git-wip-us.apache.org/repos/asf/incubator-
>> cloudstack/repo
>>> Commit: http://git-wip-us.apache.org/repos/asf/incubator-
>> cloudstack/commit/53a3c2f1
>>> Tree: http://git-wip-us.apache.org/repos/asf/incubator-
>> cloudstack/tree/53a3c2f1
>>> Diff: http://git-wip-us.apache.org/repos/asf/incubator-
>> cloudstack/diff/53a3c2f1
>>> 
>>> Branch: refs/heads/4.0
>>> Commit: 53a3c2f171dfea5de6e0cda2ae3317560ecd91f5
>>> Parents: 6c6d9bb
>>> Author: Rohit Yadav <bh...@apache.org>
>>> Authored: Tue Oct 16 21:38:05 2012 +0530
>>> Committer: Rohit Yadav <bh...@apache.org>
>>> Committed: Tue Oct 16 21:38:05 2012 +0530
>>> 
>>> ---------------------------------------------------------------------
>> -
>>> build/build-devcloud.xml |    2 ++
>>> 1 files changed, 2 insertions(+), 0 deletions(-)
>>> ---------------------------------------------------------------------
>> -
>>> 
>>> 
>>> http://git-wip-us.apache.org/repos/asf/incubator-
>> cloudstack/blob/53a3c2f1/build/build-devcloud.xml
>>> ---------------------------------------------------------------------
>> -
>>> diff --git a/build/build-devcloud.xml b/build/build-devcloud.xml
>>> index a001dc2..d5a6fb8 100644
>>> --- a/build/build-devcloud.xml
>>> +++ b/build/build-devcloud.xml
>>> @@ -80,12 +80,14 @@
>>>     </scp>
>>> 
>>>     <echo message="copying target folder to remote"/>
>>> +    <sshexec trust="yes" host="${host}" port="${port}"
>> username="root" password="password" command="cd
>> /opt/cloudstack/incubator-cloudstack; mkdir -p target"/>
>>>     <scp trust="yes" port="${port}"
>> todir="root:password@${host}:/opt/cloudstack/incubator-
>> cloudstack/target">
>>>       <fileset dir="target">
>>>       </fileset>
>>>     </scp>
>>> 
>>>     <echo message="copying dist folder to remote"/>
>>> +    <sshexec trust="yes" host="${host}" port="${port}"
>> username="root" password="password" command="cd
>> /opt/cloudstack/incubator-cloudstack; mkdir -p dist"/>
>>>     <scp trust="yes" port="${port}"
>> todir="root:password@${host}:/opt/cloudstack/incubator-
>> cloudstack/dist">
>>>       <fileset dir="dist">
>>>       </fileset>
>>> 


RE: git commit: DevCloud: Make sure destination paths exists before scp

Posted by Edison Su <Ed...@citrix.com>.
I think we don't need this patch at all, target/dist folder are created when I build devcloud, so if you don't delete them explicitly, there shouldn't have any problem.
But anyway, it's no harm to add this patch.
> -----Original Message-----
> From: Rohit Yadav [mailto:rohit.yadav@citrix.com]
> Sent: Tuesday, October 16, 2012 1:42 PM
> To: cloudstack-dev@incubator.apache.org
> Subject: RE: git commit: DevCloud: Make sure destination paths exists
> before scp
> 
> This (DevCloud using ant) only works with ant and since we've maven on
> master now, it's not applicable for master.
> 
> ________________________________________
> From: David Nalley [david@gnsa.us]
> Sent: Wednesday, October 17, 2012 1:47 AM
> To: cloudstack-dev@incubator.apache.org
> Subject: Re: git commit: DevCloud: Make sure destination paths exists
> before scp
> 
> Is there a reason this only hit 4.0?
> 
> --David
> 
> On Tue, Oct 16, 2012 at 12:09 PM,  <bh...@apache.org> wrote:
> > Updated Branches:
> >   refs/heads/4.0 6c6d9bb89 -> 53a3c2f17
> >
> >
> > DevCloud: Make sure destination paths exists before scp
> >
> > Makes dirs if they are not present before scp-ing target/ and dist/
> to
> > devcloud.
> >
> > Signed-off-by: Rohit Yadav <bh...@apache.org>
> >
> >
> > Project: http://git-wip-us.apache.org/repos/asf/incubator-
> cloudstack/repo
> > Commit: http://git-wip-us.apache.org/repos/asf/incubator-
> cloudstack/commit/53a3c2f1
> > Tree: http://git-wip-us.apache.org/repos/asf/incubator-
> cloudstack/tree/53a3c2f1
> > Diff: http://git-wip-us.apache.org/repos/asf/incubator-
> cloudstack/diff/53a3c2f1
> >
> > Branch: refs/heads/4.0
> > Commit: 53a3c2f171dfea5de6e0cda2ae3317560ecd91f5
> > Parents: 6c6d9bb
> > Author: Rohit Yadav <bh...@apache.org>
> > Authored: Tue Oct 16 21:38:05 2012 +0530
> > Committer: Rohit Yadav <bh...@apache.org>
> > Committed: Tue Oct 16 21:38:05 2012 +0530
> >
> > ---------------------------------------------------------------------
> -
> >  build/build-devcloud.xml |    2 ++
> >  1 files changed, 2 insertions(+), 0 deletions(-)
> > ---------------------------------------------------------------------
> -
> >
> >
> > http://git-wip-us.apache.org/repos/asf/incubator-
> cloudstack/blob/53a3c2f1/build/build-devcloud.xml
> > ---------------------------------------------------------------------
> -
> > diff --git a/build/build-devcloud.xml b/build/build-devcloud.xml
> > index a001dc2..d5a6fb8 100644
> > --- a/build/build-devcloud.xml
> > +++ b/build/build-devcloud.xml
> > @@ -80,12 +80,14 @@
> >      </scp>
> >
> >      <echo message="copying target folder to remote"/>
> > +    <sshexec trust="yes" host="${host}" port="${port}"
> username="root" password="password" command="cd
> /opt/cloudstack/incubator-cloudstack; mkdir -p target"/>
> >      <scp trust="yes" port="${port}"
> todir="root:password@${host}:/opt/cloudstack/incubator-
> cloudstack/target">
> >        <fileset dir="target">
> >        </fileset>
> >      </scp>
> >
> >      <echo message="copying dist folder to remote"/>
> > +    <sshexec trust="yes" host="${host}" port="${port}"
> username="root" password="password" command="cd
> /opt/cloudstack/incubator-cloudstack; mkdir -p dist"/>
> >      <scp trust="yes" port="${port}"
> todir="root:password@${host}:/opt/cloudstack/incubator-
> cloudstack/dist">
> >        <fileset dir="dist">
> >        </fileset>
> >

RE: git commit: DevCloud: Make sure destination paths exists before scp

Posted by Rohit Yadav <ro...@citrix.com>.
This (DevCloud using ant) only works with ant and since we've maven on master now, it's not applicable for master.

________________________________________
From: David Nalley [david@gnsa.us]
Sent: Wednesday, October 17, 2012 1:47 AM
To: cloudstack-dev@incubator.apache.org
Subject: Re: git commit: DevCloud: Make sure destination paths exists before scp

Is there a reason this only hit 4.0?

--David

On Tue, Oct 16, 2012 at 12:09 PM,  <bh...@apache.org> wrote:
> Updated Branches:
>   refs/heads/4.0 6c6d9bb89 -> 53a3c2f17
>
>
> DevCloud: Make sure destination paths exists before scp
>
> Makes dirs if they are not present before scp-ing target/ and dist/ to
> devcloud.
>
> Signed-off-by: Rohit Yadav <bh...@apache.org>
>
>
> Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
> Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/53a3c2f1
> Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/53a3c2f1
> Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/53a3c2f1
>
> Branch: refs/heads/4.0
> Commit: 53a3c2f171dfea5de6e0cda2ae3317560ecd91f5
> Parents: 6c6d9bb
> Author: Rohit Yadav <bh...@apache.org>
> Authored: Tue Oct 16 21:38:05 2012 +0530
> Committer: Rohit Yadav <bh...@apache.org>
> Committed: Tue Oct 16 21:38:05 2012 +0530
>
> ----------------------------------------------------------------------
>  build/build-devcloud.xml |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/53a3c2f1/build/build-devcloud.xml
> ----------------------------------------------------------------------
> diff --git a/build/build-devcloud.xml b/build/build-devcloud.xml
> index a001dc2..d5a6fb8 100644
> --- a/build/build-devcloud.xml
> +++ b/build/build-devcloud.xml
> @@ -80,12 +80,14 @@
>      </scp>
>
>      <echo message="copying target folder to remote"/>
> +    <sshexec trust="yes" host="${host}" port="${port}" username="root" password="password" command="cd /opt/cloudstack/incubator-cloudstack; mkdir -p target"/>
>      <scp trust="yes" port="${port}" todir="root:password@${host}:/opt/cloudstack/incubator-cloudstack/target">
>        <fileset dir="target">
>        </fileset>
>      </scp>
>
>      <echo message="copying dist folder to remote"/>
> +    <sshexec trust="yes" host="${host}" port="${port}" username="root" password="password" command="cd /opt/cloudstack/incubator-cloudstack; mkdir -p dist"/>
>      <scp trust="yes" port="${port}" todir="root:password@${host}:/opt/cloudstack/incubator-cloudstack/dist">
>        <fileset dir="dist">
>        </fileset>
>

Re: git commit: DevCloud: Make sure destination paths exists before scp

Posted by David Nalley <da...@gnsa.us>.
Is there a reason this only hit 4.0?

--David

On Tue, Oct 16, 2012 at 12:09 PM,  <bh...@apache.org> wrote:
> Updated Branches:
>   refs/heads/4.0 6c6d9bb89 -> 53a3c2f17
>
>
> DevCloud: Make sure destination paths exists before scp
>
> Makes dirs if they are not present before scp-ing target/ and dist/ to
> devcloud.
>
> Signed-off-by: Rohit Yadav <bh...@apache.org>
>
>
> Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
> Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/53a3c2f1
> Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/53a3c2f1
> Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/53a3c2f1
>
> Branch: refs/heads/4.0
> Commit: 53a3c2f171dfea5de6e0cda2ae3317560ecd91f5
> Parents: 6c6d9bb
> Author: Rohit Yadav <bh...@apache.org>
> Authored: Tue Oct 16 21:38:05 2012 +0530
> Committer: Rohit Yadav <bh...@apache.org>
> Committed: Tue Oct 16 21:38:05 2012 +0530
>
> ----------------------------------------------------------------------
>  build/build-devcloud.xml |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/53a3c2f1/build/build-devcloud.xml
> ----------------------------------------------------------------------
> diff --git a/build/build-devcloud.xml b/build/build-devcloud.xml
> index a001dc2..d5a6fb8 100644
> --- a/build/build-devcloud.xml
> +++ b/build/build-devcloud.xml
> @@ -80,12 +80,14 @@
>      </scp>
>
>      <echo message="copying target folder to remote"/>
> +    <sshexec trust="yes" host="${host}" port="${port}" username="root" password="password" command="cd /opt/cloudstack/incubator-cloudstack; mkdir -p target"/>
>      <scp trust="yes" port="${port}" todir="root:password@${host}:/opt/cloudstack/incubator-cloudstack/target">
>        <fileset dir="target">
>        </fileset>
>      </scp>
>
>      <echo message="copying dist folder to remote"/>
> +    <sshexec trust="yes" host="${host}" port="${port}" username="root" password="password" command="cd /opt/cloudstack/incubator-cloudstack; mkdir -p dist"/>
>      <scp trust="yes" port="${port}" todir="root:password@${host}:/opt/cloudstack/incubator-cloudstack/dist">
>        <fileset dir="dist">
>        </fileset>
>